Source

repoman / tests / output / merge.py.out

Full commit

Merging changes (merge modules)

Merging core/dev into core/stable

a  merge; 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
b  merge; 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
c  merge; 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
d  merge; 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
merge complete - use "repo commit" to complete the merge after reviewing or "repo update --clean" to undo the merge
Repository forest in directory <TESTROOT>/forest2
Working branch: core/stable
Modules: a, b, c, d
Operation in progress: merge
Checking for changes... 
commit complete
changeset:   3:03ef1d64b725
tag:         tip
user:        Jane Doכ <jane.doe@rlyeh.org>
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     Created branch core/זרו

changeset:   2:31b8cec12768
branch:      core/stable
tag:         tip
parent:      0:8759c9b85d97
parent:      1:11be38c2b8b7
user:        Jane Doכ <jane.doe@rlyeh.org>
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     Merge core/dev to core/stable

Repository forest in directory <TESTROOT>/forest2
Working branch: core/stable
Modules: a, b, c, d

Merging with ancestors (skip modules)

Merging core/זרו into core/stable

a  skip; other is ancestor of local
b  skip; other is ancestor of local
c  skip; other is ancestor of local
d  skip; module not in both branches
merge complete - use "repo commit" to complete the merge after reviewing or "repo update --clean" to undo the merge
changeset:   3:03ef1d64b725
tag:         tip
user:        Jane Doכ <jane.doe@rlyeh.org>
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     Created branch core/זרו

changeset:   2:31b8cec12768
branch:      core/stable
tag:         tip
parent:      0:8759c9b85d97
parent:      1:11be38c2b8b7
user:        Jane Doכ <jane.doe@rlyeh.org>
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     Merge core/dev to core/stable

Extended branch core/זרו:
d  31b8cec12768
Working branch: core/stable
Repository forest in directory <TESTROOT>/forest2
Working branch: core/stable
Modules: a, b, c, d

Merging to uncommited branch (fast-forward)
Updating to core/זרו:
a  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
b  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
c  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
d  No update needed
Repository forest in directory <TESTROOT>/forest2
Working branch: core/זרו
Modules: a, b, c, d

Merging core/stable into core/זרו

a  fast-forward
b  fast-forward
c  fast-forward
d  skip; other is ancestor of local
merge complete - use "repo commit" to complete the merge after reviewing or "repo update --clean" to undo the merge
Checking for changes... fast-forward merge committed
Repository forest in directory <TESTROOT>/forest2
Working branch: core/זרו
Modules: a, b, c, d
changeset:   5:96095c82625b
tag:         tip
user:        Jane Doכ <jane.doe@rlyeh.org>
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     Fast-forward of branch core/זרו

changeset:   2:31b8cec12768
branch:      core/stable
tag:         tip
parent:      0:8759c9b85d97
parent:      1:11be38c2b8b7
user:        Jane Doכ <jane.doe@rlyeh.org>
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     Merge core/dev to core/stable


Check abort on outstanding commited changes
abort: one or more modules have outstanding uncommited changes (use 'repo status' to list changes)
abort: one or more modules have outstanding uncommited changes (use 'repo status' to list changes)

Merge errors (same branch, non-existing branch)
abort: how would I merge a branch into itself?
abort: branch core/nonexisting not found.
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
abort: working copy is not positioned correctly on branch core/זרו; use repo info for details.
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
abort: a: changeset 11be38c2b8b7f961f5134343aca0df017e049fd8 is missing, please pull branch "core/dev"
Repository forest in directory <TESTROOT>/forest2
Working branch: core/זרו
Modules: a, b, c, d
abort: a: changeset 31b8cec12768d20222986b9d3652c5b4571d55b8 is missing, please pull branch "core/זרו"
pulling from ../zzz
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Updating to core/dev:
a  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
b  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
c  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
d  0 files updated, 0 files merged, 0 files removed, 0 files unresolved

Merging core/stable into core/dev

a  merge; 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
b  fast-forward
c  fast-forward
d  fast-forward
merge complete - use "repo commit" to complete the merge after reviewing or "repo update --clean" to undo the merge
abort: there is an outstanding merge operation that is blocking pull
state: True
abort: merge in progress, use --clean to abort the merge
state: True
Updating to core/dev:
a  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
b  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
c  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
d  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
state: False
Repository forest in directory <TESTROOT>/forest2
Working branch: core/dev
Modules: a, b, c, d