Mercurial > hg
comparison tests/test-graft.t @ 22305:bdc0e04df243
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 27 Aug 2014 18:35:34 +0200 |
| parents | f4e5753745e9 9472284df4eb |
| children | 8fe74328f700 |
comparison
equal
deleted
inserted
replaced
| 22304:5678b0e3608f | 22305:bdc0e04df243 |
|---|---|
| 676 (no more unresolved files) | 676 (no more unresolved files) |
| 677 $ hg graft -c | 677 $ hg graft -c |
| 678 grafting revision 28 | 678 grafting revision 28 |
| 679 $ cat a | 679 $ cat a |
| 680 abc | 680 abc |
| 681 | |
| 682 Continue testing same origin policy, using revision numbers from test above | |
| 683 but do some destructive editing of the repo: | |
| 684 | |
| 685 $ hg up -qC 7 | |
| 686 $ hg tag -l -r 13 tmp | |
| 687 $ hg --config extensions.mq= strip 2 | |
| 688 saved backup bundle to $TESTTMP/a/.hg/strip-backup/5c095ad7e90f-backup.hg (glob) | |
| 689 $ hg graft tmp | |
| 690 skipping already grafted revision 8 (2 also has unknown origin 5c095ad7e90f871700f02dd1fa5012cb4498a2d4) | |
| 691 [255] |