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