Source

repoman / tests / output / undo.py.out

Full commit
% no initial undo information
abort: nothing to undo
% review undo of commit
operation: Commit
involved modules: a
Undo this commit (y/yes/n/no)? n
undo aborted.
% accept undo
operation: Commit
involved modules: a
a  repository tip rolled back to revision 1 (undo commit)
% undo with tampered module
operation: Commit
involved modules: a, b
The following modules have changed and cannot be included: b
a  repository tip rolled back to revision 1 (undo commit)
% undo branch creation
Repository forest in directory <TESTROOT>/undof
Working branch: core/test
Modules: a, b
undo in .root/.hg/store: True
repoman.undo not in .root/.hg/store: True
operation: Created branch core/test
involved modules: (metadata)
(metadata)  repository tip rolled back to revision 2 (undo commit)
Repository forest in directory <TESTROOT>/undof
Working branch: core/dev
Modules: a, b
% undo merge without undoing metadata pull
changeset:   4:b871bb560e25
tag:         tip
user:        Jane Doë <jane.doe@rlyeh.org>
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     Created branch core/removed

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

changeset:   4:b871bb560e25
tag:         tip
user:        Jane Doë <jane.doe@rlyeh.org>
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     Created branch core/removed


Merging core/stable into core/new

a  merge; 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
b  fast-forward
merge complete - use "repo commit" to complete the merge after reviewing or "repo update --clean" to undo the merge
Checking for changes... 
commit complete
changeset:   5:6f82b638f301
tag:         tip
user:        Jane Doë <jane.doe@rlyeh.org>
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     Fast-forward of branch core/new

operation: Commit merge
involved modules: (metadata), a
(metadata)  repository tip rolled back to revision 4 (undo commit)
a           repository tip rolled back to revision 3 (undo commit)
@  changeset:   4:b871bb560e25
|  tag:         tip
|  user:        Jane Doë <jane.doe@rlyeh.org>
|  date:        Thu Jan 01 00:00:00 1970 +0000
|  summary:     Created branch core/removed
|
o  changeset:   3:711093719ab5
|  user:        Jane Doë <jane.doe@rlyeh.org>
|  date:        Thu Jan 01 00:00:00 1970 +0000
|  summary:     Created branch core/new
|
o  changeset:   2:6194704b9d0a
|  user:        Jane Doe <jane.doe@rlyeh.org>
|  date:        Thu Jan 01 00:01:00 1970 +0000
|  summary:     Created branch core/dev
|
o  changeset:   1:9cbeccf3af9f
|  user:        Jane Doe <jane.doe@rlyeh.org>
|  date:        Thu Jan 01 00:01:00 1970 +0000
|  summary:     Created branch core/stable
|
o  changeset:   0:cc7f93517463
   user:        Jane Doe <jane.doe@rlyeh.org>
   date:        Thu Jan 01 00:01:00 1970 +0000
   summary:     initial forest