Source

repoman / tests / output / pull.py.out

Full commit
cloning forest1 to forest2
pull on clean clone - i.e., without incoming changes
Pulling changes from <ROOT>/forest1 (branches: core/dev)

~~~ (metadata) ~~~
no changes found

~~~ a ~~~
no changes found

~~~ b ~~~
no changes found

~~~ c ~~~
no changes found

~~~ d ~~~
no changes found

clone forest2 to forest3
add and commit changeset in forest2
pull on working branch (implicit)
Pulling changes from <TESTROOT>/forest2 (branches: core/dev)

~~~ (metadata) ~~~
no changes found

~~~ a ~~~
no changes found

~~~ b ~~~
no changes found

~~~ c ~~~
added 1 changesets with 1 changes to 1 files
1 files updated, 0 files merged, 0 files removed, 0 files unresolved

~~~ d ~~~
no changes found

pull on another branch (i.e., using arg)
Pulling changes from <TESTROOT>/forest2 (branches: core/stable)

~~~ (metadata) ~~~
no changes found

~~~ a ~~~
no changes found

~~~ b ~~~
no changes found

~~~ c ~~~
no changes found

~~~ d ~~~
no changes found

pull on an unknown branch
Incoming changes from <TESTROOT>/forest2 (branches: unknownbranch)

~~~ (metadata) ~~~
no changes found

skipping unknown branch unknownbranch
no valid branches given. aborting.
create a new branch core/new1 in forest2
Restricting list of modules to 'a, b, c'
Created branch core/new1:
a  11be38c2b8b7
b  11be38c2b8b7
c  84d97df37cef
Working branch: core/new1
Updating to core/dev:
a  No update needed
b  No update needed
c  No update needed
d  No update needed
pull metadata change specifying an unknown branch and a known branch
Pulling changes from <TESTROOT>/forest2 (branches: unknownbranch, core/dev)

~~~ (metadata) ~~~
added 1 changesets with 1 changes to 1 files
1 files updated, 0 files merged, 0 files removed, 0 files unresolved

skipping unknown branch unknownbranch
~~~ a ~~~
no changes found

~~~ b ~~~
no changes found

~~~ c ~~~
no changes found

~~~ d ~~~
no changes found

create another branch in forest2
Restricting list of modules to 'a, c'
Created branch core/new2:
a  11be38c2b8b7
c  84d97df37cef
Working branch: core/new2
Updating to core/dev:
a  No update needed
b  No update needed
c  No update needed
d  No update needed
pull metadata change without --branch arg
Pulling changes from <TESTROOT>/forest2 (branches: core/dev)

~~~ (metadata) ~~~
added 1 changesets with 1 changes to 1 files
1 files updated, 0 files merged, 0 files removed, 0 files unresolved

~~~ a ~~~
no changes found

~~~ b ~~~
no changes found

~~~ c ~~~
no changes found

~~~ d ~~~
no changes found

Test --noupdate...
add and commit another changeset in forest2
check parents before and after pull, to check that, in fact, the --noupdate flag prevents an update
tip before pull --noupdate
11be38c2b8b7f961f5134343aca0df017e049fd8
Pulling changes from <TESTROOT>/forest2 (branches: core/dev, core/stable)

~~~ (metadata) ~~~
no changes found

~~~ a ~~~
no changes found

~~~ b ~~~
added 1 changesets with 1 changes to 1 files
note: module is not at branch head

~~~ c ~~~
no changes found

~~~ d ~~~
no changes found

tip after pull --noupdate
11be38c2b8b7f961f5134343aca0df017e049fd8
Test (SUCCESS): pull with --noupdate flag did not change status of the working directory.
Test fast-forwarding...
Setting up test-situation
--update to core/stable in forest2
Updating to core/stable:
a  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
b  1 files updated, 0 files merged, 2 files removed, 0 files unresolved
c  1 files updated, 0 files merged, 2 files removed, 0 files unresolved
d  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
--create a new branch core/new on top of core/stable in forest2
Restricting list of modules to 'a, b, c'
Created branch core/new:
a  8759c9b85d97
b  8759c9b85d97
c  8759c9b85d97
Working branch: core/new
Updating to core/stable:
a  No update needed
b  No update needed
c  No update needed
d  No update needed
--pull core/new to forest3
Pulling changes from <TESTROOT>/forest2 (branches: core/new)

~~~ (metadata) ~~~
added 1 changesets with 1 changes to 1 files
1 files updated, 0 files merged, 0 files removed, 0 files unresolved

~~~ a ~~~
no changes found

~~~ b ~~~
no changes found

~~~ c ~~~
no changes found

~~~ d ~~~
no changes found

--merge core/dev into core/stable in forest2

Merging core/dev into core/stable

a  merge; 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
b  merge; 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
c  merge; 3 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
Checking for changes... 
commit complete
--update to core/new in forest2
module "d" isn't covered by the specified branch.
Updating to core/new:
a  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
b  1 files updated, 0 files merged, 2 files removed, 0 files unresolved
c  1 files updated, 0 files merged, 2 files removed, 0 files unresolved
--merge core/stable into core/new in forest2
  (as core/new has no updates and core/stable has been updated (via the merge) core/new is fast-forwarded)

Merging core/stable into core/new

a  fast-forward
b  fast-forward
c  fast-forward
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
Checking for changes... fast-forward merge committed
Done setting up.

now pull (on all known branches) from forest3
we expect messages that core/new has been fast-forwarded
Pulling changes from <TESTROOT>/forest2 (branches: core/dev, core/stable, core/new)

~~~ (metadata) ~~~
added 1 changesets with 1 changes to 1 files
1 files updated, 0 files merged, 0 files removed, 0 files unresolved

~~~ a ~~~
Branch core/new was fast-forwarded to 31b8cec12768
added 1 changesets with 0 changes to 0 files

~~~ b ~~~
Branch core/new was fast-forwarded to 8a0d301043ae
added 1 changesets with 0 changes to 0 files
1 files updated, 0 files merged, 0 files removed, 0 files unresolved

~~~ c ~~~
Branch core/new was fast-forwarded to 8a0d301043ae
added 1 changesets with 0 changes to 0 files

~~~ d ~~~
added 1 changesets with 0 changes to 0 files

Test --clean...
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
Pulling changes from <TESTROOT>/forest2 (branches: core/dev)

~~~ (metadata) ~~~
no changes found

~~~ a ~~~
no changes found

~~~ b ~~~
added 1 changesets with 1 changes to 1 files (+1 heads)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved

~~~ c ~~~
no changes found

~~~ d ~~~
no changes found

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
Pulling changes from <TESTROOT>/forest2 (branches: core/dev)

~~~ (metadata) ~~~
no changes found

~~~ a ~~~
no changes found

~~~ b ~~~
added 1 changesets with 1 changes to 1 files (+1 heads)
warning: update crosses branches (use "repo rebase" or "hg merge")

~~~ c ~~~
no changes found

~~~ d ~~~
no changes found

~~~ a ~~~
1

~~~ b ~~~
4

~~~ c ~~~
2

~~~ d ~~~
1

operation: Pull from <TESTROOT>/forest2, branches: core/dev
involved modules: b
b  repository tip rolled back to revision 4 (undo pull)
bar already tracked!
Pulling changes from <TESTROOT>/forest2 (branches: core/dev)

~~~ (metadata) ~~~
no changes found

~~~ a ~~~
no changes found

~~~ b ~~~
added 1 changesets with 1 changes to 1 files (+1 heads)
2 files updated, 0 files merged, 1 files removed, 0 files unresolved

~~~ c ~~~
no changes found

~~~ d ~~~
no changes found

~~~ a ~~~
1

~~~ b ~~~
5

~~~ c ~~~
2

~~~ d ~~~
1

backup exists: True