equal
deleted
inserted
replaced
27 $ echo c2 > b/c |
27 $ echo c2 > b/c |
28 $ hg up --verbose c1 |
28 $ hg up --verbose c1 |
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 |
36 |
36 |
37 Make a file named b |
37 Make a file named b |
49 $ echo b2 > b |
49 $ echo b2 > b |
50 $ hg up --verbose b1 |
50 $ hg up --verbose b1 |
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 |
58 |
58 |
59 Perform an update the causes b/c to be backed up again - it should replace the backup b file |
59 Perform an update the causes b/c to be backed up again - it should replace the backup b file |
63 $ echo c3 > b/c |
63 $ echo c3 > b/c |
64 $ hg up --verbose c1 |
64 $ hg up --verbose c1 |
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 |
73 |
73 |
74 Cause a symlink to be backed up that points to a valid location from the backup dir |
74 Cause a symlink to be backed up that points to a valid location from the backup dir |
96 $ echo c4 > b/c |
96 $ echo c4 > b/c |
97 $ hg up --verbose c1 |
97 $ hg up --verbose c1 |
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 |
106 c4 |
106 c4 |
107 $ ls ../sym-link-target |
107 $ ls ../sym-link-target |
114 $ echo c5 > b/c |
114 $ echo c5 > b/c |
115 $ hg up --verbose c1 --config ui.origbackuppath=.hg/badorigbackups |
115 $ hg up --verbose c1 --config ui.origbackuppath=.hg/badorigbackups |
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] |
123 $ cat .hg/badorigbackups |
123 $ cat .hg/badorigbackups |
124 data |
124 data |