diff options
| author | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-09-27 14:30:31 +0100 |
|---|---|---|
| committer | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-09-27 14:30:31 +0100 |
| commit | 4b0aa73b8c69bd5b7521337809f7bc4714209a5a (patch) | |
| tree | 75f4c36771caf222280249cd1ed611d5ade8bd48 /tests/test-convert-p4.out | |
| parent | 59a96880b5d035db83067acda8345497c75d7716 (diff) | |
| parent | 921ced43c48c1d170452a7b251b94cc96ec8dd44 (diff) | |
| download | mercurial-tarball-baserock/morph.tar.gz | |
Merge remote-tracking branch 'origin/master' into baserock/morphbaserock/morph
This changes us to 1.9.3 which might stand a better chance of being
usable by Lorry.
We also undo the setup.py change because python now supports bz2
Diffstat (limited to 'tests/test-convert-p4.out')
| -rw-r--r-- | tests/test-convert-p4.out | 88 |
1 files changed, 88 insertions, 0 deletions
diff --git a/tests/test-convert-p4.out b/tests/test-convert-p4.out new file mode 100644 index 0000000..9451cf8 --- /dev/null +++ b/tests/test-convert-p4.out @@ -0,0 +1,88 @@ +% create p4 depot +% start the p4 server +% create a client spec +Client hg-p4-import saved. +% populate the depot +//depot/test-mercurial-import/a#1 - opened for add +//depot/test-mercurial-import/b/c#1 - opened for add +Submitting change 1. +Locking 2 files ... +add //depot/test-mercurial-import/a#1 +add //depot/test-mercurial-import/b/c#1 +Change 1 submitted. +% change some files +//depot/test-mercurial-import/a#1 - opened for edit +Submitting change 2. +Locking 1 files ... +edit //depot/test-mercurial-import/a#2 +Change 2 submitted. +//depot/test-mercurial-import/b/c#1 - opened for edit +Submitting change 3. +Locking 1 files ... +edit //depot/test-mercurial-import/b/c#2 +Change 3 submitted. +% convert +initializing destination dst repository +reading p4 views +collecting p4 changelists +1 initial +2 change a +3 change b/c +scanning source... +sorting... +converting... +2 initial +1 change a +0 change b/c +rev=2 desc="change b/c" tags="tip" files="b/c" +rev=1 desc="change a" tags="" files="a" +rev=0 desc="initial" tags="" files="a b/c" +% change some files +//depot/test-mercurial-import/a#2 - opened for edit +//depot/test-mercurial-import/b/c#2 - opened for edit +Submitting change 4. +Locking 2 files ... +edit //depot/test-mercurial-import/a#3 +edit //depot/test-mercurial-import/b/c#3 +Change 4 submitted. +% convert again +reading p4 views +collecting p4 changelists +1 initial +2 change a +3 change b/c +4 change a b/c +scanning source... +sorting... +converting... +0 change a b/c +rev=3 desc="change a b/c" tags="tip" files="a b/c" +rev=2 desc="change b/c" tags="" files="b/c" +rev=1 desc="change a" tags="" files="a" +rev=0 desc="initial" tags="" files="a b/c" +% interesting names +//depot/test-mercurial-import/d d#1 - opened for add +//depot/test-mercurial-import/ e/ f#1 - opened for add +Submitting change 5. +Locking 2 files ... +add //depot/test-mercurial-import/ e/ f#1 +add //depot/test-mercurial-import/d d#1 +Change 5 submitted. +% convert again +reading p4 views +collecting p4 changelists +1 initial +2 change a +3 change b/c +4 change a b/c +5 add d e f +scanning source... +sorting... +converting... +0 add d e f +rev=4 desc="add d e f" tags="tip" files=" e/ f d d" +rev=3 desc="change a b/c" tags="" files="a b/c" +rev=2 desc="change b/c" tags="" files="b/c" +rev=1 desc="change a" tags="" files="a" +rev=0 desc="initial" tags="" files="a b/c" +% stop the p4 server |