equal
deleted
inserted
replaced
97 |
97 |
98 $ hg diff --git --root dir1 -r 1:tip dir2 |
98 $ hg diff --git --root dir1 -r 1:tip dir2 |
99 warning: dir2 not inside relative root dir1 |
99 warning: dir2 not inside relative root dir1 |
100 |
100 |
101 $ hg diff --git --root dir1 -r 1:tip 'dir2/{copy}' |
101 $ hg diff --git --root dir1 -r 1:tip 'dir2/{copy}' |
102 warning: dir2/{copy} not inside relative root dir1 (glob) |
102 warning: dir2/{copy} not inside relative root dir1 |
103 |
103 |
104 $ cd dir1 |
104 $ cd dir1 |
105 $ hg diff --git --root .. -r 1:tip |
105 $ hg diff --git --root .. -r 1:tip |
106 diff --git a/dir1/new b/dir1/copy |
106 diff --git a/dir1/new b/dir1/copy |
107 copy from dir1/new |
107 copy from dir1/new |
159 +++ b/copy |
159 +++ b/copy |
160 @@ -1,1 +1,2 @@ |
160 @@ -1,1 +1,2 @@ |
161 new |
161 new |
162 +copy1 |
162 +copy1 |
163 $ hg diff --git --root . -r 1:tip ../dir2 |
163 $ hg diff --git --root . -r 1:tip ../dir2 |
164 warning: ../dir2 not inside relative root . (glob) |
164 warning: ../dir2 not inside relative root . |
165 $ hg diff --git --root . -r 1:tip '../dir2/*' |
165 $ hg diff --git --root . -r 1:tip '../dir2/*' |
166 warning: ../dir2/* not inside relative root . (glob) |
166 warning: ../dir2/* not inside relative root . (glob) |
167 $ cd .. |
167 $ cd .. |
168 |
168 |
169 Rename: |
169 Rename: |