Show More
@@ -29,7 +29,7 b' Peform an update that causes b/c to be b' | |||||
29 | resolving manifests |
|
29 | resolving manifests | |
30 | b/c: replacing untracked file |
|
30 | b/c: replacing untracked file | |
31 | getting b/c |
|
31 | getting b/c | |
32 | creating directory: $TESTTMP/repo/.hg/origbackups/b |
|
32 | creating directory: $TESTTMP/repo/.hg/origbackups/b (glob) | |
33 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
33 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
34 | (activating bookmark c1) |
|
34 | (activating bookmark c1) | |
35 | $ test -f .hg/origbackups/b/c |
|
35 | $ test -f .hg/origbackups/b/c | |
@@ -51,7 +51,7 b' Perform an update that causes b to be ba' | |||||
51 | resolving manifests |
|
51 | resolving manifests | |
52 | b: replacing untracked file |
|
52 | b: replacing untracked file | |
53 | getting b |
|
53 | getting b | |
54 | removing conflicting directory: $TESTTMP/repo/.hg/origbackups/b |
|
54 | removing conflicting directory: $TESTTMP/repo/.hg/origbackups/b (glob) | |
55 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
55 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
56 | (activating bookmark b1) |
|
56 | (activating bookmark b1) | |
57 | $ test -f .hg/origbackups/b |
|
57 | $ test -f .hg/origbackups/b | |
@@ -65,8 +65,8 b' Perform an update the causes b/c to be b' | |||||
65 | resolving manifests |
|
65 | resolving manifests | |
66 | b/c: replacing untracked file |
|
66 | b/c: replacing untracked file | |
67 | getting b/c |
|
67 | getting b/c | |
68 | creating directory: $TESTTMP/repo/.hg/origbackups/b |
|
68 | creating directory: $TESTTMP/repo/.hg/origbackups/b (glob) | |
69 | removing conflicting file: $TESTTMP/repo/.hg/origbackups/b |
|
69 | removing conflicting file: $TESTTMP/repo/.hg/origbackups/b (glob) | |
70 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
70 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
71 | (activating bookmark c1) |
|
71 | (activating bookmark c1) | |
72 | $ test -d .hg/origbackups/b |
|
72 | $ test -d .hg/origbackups/b | |
@@ -98,8 +98,8 b' Perform an update that causes b/c to be ' | |||||
98 | resolving manifests |
|
98 | resolving manifests | |
99 | b/c: replacing untracked file |
|
99 | b/c: replacing untracked file | |
100 | getting b/c |
|
100 | getting b/c | |
101 | creating directory: $TESTTMP/repo/.hg/origbackups/b |
|
101 | creating directory: $TESTTMP/repo/.hg/origbackups/b (glob) | |
102 | removing conflicting file: $TESTTMP/repo/.hg/origbackups/b |
|
102 | removing conflicting file: $TESTTMP/repo/.hg/origbackups/b (glob) | |
103 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
103 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
104 | (activating bookmark c1) |
|
104 | (activating bookmark c1) | |
105 | $ cat .hg/origbackups/b/c |
|
105 | $ cat .hg/origbackups/b/c | |
@@ -116,7 +116,7 b' Incorrectly configure origbackuppath to ' | |||||
116 | resolving manifests |
|
116 | resolving manifests | |
117 | b/c: replacing untracked file |
|
117 | b/c: replacing untracked file | |
118 | getting b/c |
|
118 | getting b/c | |
119 | creating directory: $TESTTMP/repo/.hg/badorigbackups/b |
|
119 | creating directory: $TESTTMP/repo/.hg/badorigbackups/b (glob) | |
120 | abort: The system cannot find the path specified: '$TESTTMP/repo/.hg/badorigbackups/b' (glob) (windows !) |
|
120 | abort: The system cannot find the path specified: '$TESTTMP/repo/.hg/badorigbackups/b' (glob) (windows !) | |
121 | abort: Not a directory: '$TESTTMP/repo/.hg/badorigbackups/b' (no-windows !) |
|
121 | abort: Not a directory: '$TESTTMP/repo/.hg/badorigbackups/b' (no-windows !) | |
122 | [255] |
|
122 | [255] |
General Comments 0
You need to be logged in to leave comments.
Login now