Source

repoman / tests / output / combine.py.out

Full commit

* initial graph:
o  changeset:   4:a6178af3c8c2
|  tag:         tip
|  parent:      1:d2c68f21bb78
|  user:        Jane Doë <jane.doe@rlyeh.org>
|  date:        Thu Jan 01 00:00:00 1970 +0000
|  summary:     b
|
| @  changeset:   3:5d5de94345a0
| |  user:        Jane Doë <jane.doe@rlyeh.org>
| |  date:        Thu Jan 01 00:00:00 1970 +0000
| |  summary:     a2
| |
| o  changeset:   2:3044535ca74c
|/   user:        Jane Doë <jane.doe@rlyeh.org>
|    date:        Thu Jan 01 00:00:00 1970 +0000
|    summary:     a1
|
o  changeset:   1:d2c68f21bb78
|  user:        Jane Doë <jane.doe@rlyeh.org>
|  date:        Thu Jan 01 00:00:00 1970 +0000
|  summary:     base
|
o  changeset:   0:d70be7e56464
   user:        Jane Doë <jane.doe@rlyeh.org>
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     init


* combine with non-parent (fail)
abort: foreign merges in changesets or non-ancestral revision given

* combine with unrelated changesets present (fail)
abort: unrelated changesets would be removed; please combine complete graphs

* combine linear sub-graph (ok)
1:d2c68f21bb78

* combine with local changes (fail)
abort: uncommitted changes found; use the -w option to combine those as well

* combine -w with local changes (ok)
1:d2c68f21bb78
M foo

* combine with strip (default) (ok)
2 changesets found
o  changeset:   2:a6178af3c8c2
|  tag:         tip
|  user:        Jane Doë <jane.doe@rlyeh.org>
|  date:        Thu Jan 01 00:00:00 1970 +0000
|  summary:     b
|
@  changeset:   1:d2c68f21bb78
|  user:        Jane Doë <jane.doe@rlyeh.org>
|  date:        Thu Jan 01 00:00:00 1970 +0000
|  summary:     base
|
o  changeset:   0:d70be7e56464
   user:        Jane Doë <jane.doe@rlyeh.org>
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     init

M foo
? .combine-to-3044535ca74c.backup
@  changeset:   4:5d5de94345a0
|  tag:         tip
|  user:        Jane Doë <jane.doe@rlyeh.org>
|  date:        Thu Jan 01 00:00:00 1970 +0000
|  summary:     a2
|
o  changeset:   3:3044535ca74c
|  parent:      1:d2c68f21bb78
|  user:        Jane Doë <jane.doe@rlyeh.org>
|  date:        Thu Jan 01 00:00:00 1970 +0000
|  summary:     a1
|
| o  changeset:   2:a6178af3c8c2
|/   user:        Jane Doë <jane.doe@rlyeh.org>
|    date:        Thu Jan 01 00:00:00 1970 +0000
|    summary:     b
|
o  changeset:   1:d2c68f21bb78
|  user:        Jane Doë <jane.doe@rlyeh.org>
|  date:        Thu Jan 01 00:00:00 1970 +0000
|  summary:     base
|
o  changeset:   0:d70be7e56464
   user:        Jane Doë <jane.doe@rlyeh.org>
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     init


* combine linear sub-graph of branchy graph (fail)
abort: foreign merges in changesets or non-ancestral revision given

* combine complete branchy graph with public phases (fail)
abort: public changesets may not be combined

* combine complete branchy graph (ok)
0:d70be7e56464

* combine branchy graph with unrelated changeset present (fail)
abort: unrelated changesets would be removed; please combine complete graphs

* combine with chained renames (ok)
6:37746db3b2cf
A bar4
  bar
R bar

* combine with rename from non-existent file (ok)
6:37746db3b2cf
A ket2

* combine with added file in .hgignore (ok)
10:290b77eca1d2
A ignore