equal
deleted
inserted
replaced
1 $ hg init |
1 $ hg init repo |
|
2 $ cd repo |
2 $ echo start > start |
3 $ echo start > start |
3 $ hg ci -Amstart |
4 $ hg ci -Amstart |
4 adding start |
5 adding start |
5 |
6 |
6 New file: |
7 New file: |
44 +copy2 |
45 +copy2 |
45 |
46 |
46 Cross and same-directory copies with a relative root: |
47 Cross and same-directory copies with a relative root: |
47 |
48 |
48 $ hg diff --git --root .. -r 1:tip |
49 $ hg diff --git --root .. -r 1:tip |
49 abort: .. not under root '$TESTTMP' |
50 abort: .. not under root '$TESTTMP/repo' |
50 [255] |
51 [255] |
51 $ hg diff --git --root doesnotexist -r 1:tip |
52 $ hg diff --git --root doesnotexist -r 1:tip |
52 $ hg diff --git --root . -r 1:tip |
53 $ hg diff --git --root . -r 1:tip |
53 diff --git a/dir1/new b/dir1/copy |
54 diff --git a/dir1/new b/dir1/copy |
54 copy from dir1/new |
55 copy from dir1/new |
119 @@ -1,1 +1,2 @@ |
120 @@ -1,1 +1,2 @@ |
120 new |
121 new |
121 +copy2 |
122 +copy2 |
122 |
123 |
123 $ hg diff --git --root ../.. -r 1:tip |
124 $ hg diff --git --root ../.. -r 1:tip |
124 abort: ../.. not under root '$TESTTMP' |
125 abort: ../.. not under root '$TESTTMP/repo' |
125 [255] |
126 [255] |
126 $ hg diff --git --root ../doesnotexist -r 1:tip |
127 $ hg diff --git --root ../doesnotexist -r 1:tip |
127 $ hg diff --git --root .. -r 1:tip |
128 $ hg diff --git --root .. -r 1:tip |
128 diff --git a/dir1/new b/dir1/copy |
129 diff --git a/dir1/new b/dir1/copy |
129 copy from dir1/new |
130 copy from dir1/new |