comparison tests/test-rebase-issue-noparam-single-rev.out @ 6906:808f03f61ebe

Add rebase extension
author Stefano Tortarolo <stefano.tortarolo@gmail.com>
date Mon, 18 Aug 2008 21:16:31 +0200
parents
children 4bb4895e1693
comparison
equal deleted inserted replaced
6905:248e54a9456e 6906:808f03f61ebe
1 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
2 created new head
3 @ 4:r2
4 |
5 o 3:r1
6 |
7 | o 2:l1
8 |/
9 o 1:c2
10 |
11 o 0:c1
12
13
14 % Rebase with no arguments - single revision in source branch
15 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
16 saving bundle to
17 adding branch
18 adding changesets
19 adding manifests
20 adding file changes
21 added 3 changesets with 3 changes to 3 files
22 rebase completed
23 @ 4:l1
24 |
25 o 3:r2
26 |
27 o 2:r1
28 |
29 o 1:c2
30 |
31 o 0:c1
32
33 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
34 created new head
35 @ 4:r1
36 |
37 | o 3:l2
38 | |
39 | o 2:l1
40 |/
41 o 1:c2
42 |
43 o 0:c1
44
45
46 % Rebase with no arguments - single revision in target branch
47 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
48 saving bundle to
49 adding branch
50 adding changesets
51 adding manifests
52 adding file changes
53 added 3 changesets with 3 changes to 3 files
54 rebase completed
55 @ 4:l2
56 |
57 o 3:l1
58 |
59 o 2:r1
60 |
61 o 1:c2
62 |
63 o 0:c1
64