equal
deleted
inserted
replaced
123 hg --cwd a diff -r0:1 > tip.patch |
123 hg --cwd a diff -r0:1 > tip.patch |
124 python mkmsg2.py | hg --cwd b import - |
124 python mkmsg2.py | hg --cwd b import - |
125 hg --cwd b tip --template '{desc}\n' |
125 hg --cwd b tip --template '{desc}\n' |
126 rm -r b |
126 rm -r b |
127 |
127 |
|
128 # We weren't backing up the correct dirstate file when importing many patches |
|
129 # (issue963) |
|
130 echo '% import patch1 patch2; rollback' |
|
131 echo line 3 >> a/a |
|
132 hg --cwd a ci -m'third change' |
|
133 hg --cwd a export -o '../patch%R' 1 2 |
|
134 hg clone -qr0 a b |
|
135 hg --cwd b parents --template 'parent: #rev#\n' |
|
136 hg --cwd b import ../patch1 ../patch2 |
|
137 hg --cwd b rollback |
|
138 hg --cwd b parents --template 'parent: #rev#\n' |
|
139 rm -r b |
128 |
140 |
129 # bug non regression test |
141 # bug non regression test |
130 # importing a patch in a subdirectory failed at the commit stage |
142 # importing a patch in a subdirectory failed at the commit stage |
131 echo line 2 >> a/d1/d2/a |
143 echo line 2 >> a/d1/d2/a |
132 hg --cwd a ci -u someoneelse -d '1 0' -m'subdir change' |
144 hg --cwd a ci -u someoneelse -d '1 0' -m'subdir change' |