Mercurial > hg
comparison tests/test-transplant.t @ 23452:86c0d8c1484f
transplant: don't honor whitespace and format-changing diffopts
transplant uses diff purely internally.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Tue, 18 Nov 2014 21:49:05 -0800 |
parents | 501dc6b1ca78 |
children | 49caef455912 |
comparison
equal
deleted
inserted
replaced
23451:5fb1fc2e1281 | 23452:86c0d8c1484f |
---|---|
228 $ hg log --template '{rev} {parents} {desc}\n' | 228 $ hg log --template '{rev} {parents} {desc}\n' |
229 2 b1 | 229 2 b1 |
230 (transplanted from e234d668f844e1b1a765f01db83a32c0c7bfa170) | 230 (transplanted from e234d668f844e1b1a765f01db83a32c0c7bfa170) |
231 1 r2 | 231 1 r2 |
232 0 r1 | 232 0 r1 |
233 remote transplant | 233 remote transplant, and also test that transplant doesn't break with |
234 format-breaking diffopts | |
234 | 235 |
235 $ hg clone -r 1 ../t ../remote | 236 $ hg clone -r 1 ../t ../remote |
236 adding changesets | 237 adding changesets |
237 adding manifests | 238 adding manifests |
238 adding file changes | 239 adding file changes |
239 added 2 changesets with 2 changes to 2 files | 240 added 2 changesets with 2 changes to 2 files |
240 updating to branch default | 241 updating to branch default |
241 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 242 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
242 $ cd ../remote | 243 $ cd ../remote |
243 $ hg transplant --log -s ../t 2 4 | 244 $ hg --config diff.noprefix=True transplant --log -s ../t 2 4 |
244 searching for changes | 245 searching for changes |
245 applying 37a1297eb21b | 246 applying 37a1297eb21b |
246 37a1297eb21b transplanted to c19cf0ccb069 | 247 37a1297eb21b transplanted to c19cf0ccb069 |
247 applying a53251cdf717 | 248 applying a53251cdf717 |
248 a53251cdf717 transplanted to f7fe5bf98525 | 249 a53251cdf717 transplanted to f7fe5bf98525 |