Mercurial > hg
comparison tests/test-subrepo-svn.out @ 10178:cd477be6f2fc
subrepo: Subversion support
| author | Augie Fackler <durin42@gmail.com> |
|---|---|
| date | Thu, 31 Dec 2009 13:16:03 -0600 |
| parents | |
| children | e898bc7810ad |
comparison
equal
deleted
inserted
replaced
| 10177:5ca0d220ae21 | 10178:cd477be6f2fc |
|---|---|
| 1 % create subversion repo | |
| 2 Checked out revision 0. | |
| 3 A alpha | |
| 4 Adding alpha | |
| 5 Transmitting file data . | |
| 6 Committed revision 1. | |
| 7 % create hg repo | |
| 8 % first revision, no sub | |
| 9 adding a | |
| 10 % add first svn sub | |
| 11 committing subrepository s | |
| 12 % debugsub | |
| 13 path s | |
| 14 source file:///root/svn-repo | |
| 15 revision 1 | |
| 16 | |
| 17 % change file in svn and hg, commit | |
| 18 committing subrepository s | |
| 19 Sending s/alpha | |
| 20 Transmitting file data . | |
| 21 Committed revision 2. | |
| 22 At revision 2. | |
| 23 path s | |
| 24 source file:///root/svn-repo | |
| 25 revision 2 | |
| 26 | |
| 27 % should be empty despite change to s/a | |
| 28 | |
| 29 % add a commit from svn | |
| 30 U alpha | |
| 31 Updated to revision 2. | |
| 32 Sending alpha | |
| 33 Transmitting file data . | |
| 34 Committed revision 3. | |
| 35 % this commit from hg will fail | |
| 36 committing subrepository s | |
| 37 abort: svn: Commit failed (details follow): | |
| 38 svn: File '/alpha' is out of date | |
| 39 | |
| 40 % clone | |
| 41 updating to branch default | |
| 42 A s/alpha | |
| 43 Checked out revision 2. | |
| 44 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 45 % debugsub in clone | |
| 46 path s | |
| 47 source file:///root/svn-repo | |
| 48 revision 2 |