Show More
@@ -118,7 +118,7 b' class transplanter(object):' | |||
|
118 | 118 | revs = sorted(revmap) |
|
119 | 119 | p1, p2 = repo.dirstate.parents() |
|
120 | 120 | pulls = [] |
|
121 | diffopts = patch.diffopts(self.ui, opts) | |
|
121 | diffopts = patch.difffeatureopts(self.ui, opts) | |
|
122 | 122 | diffopts.git = True |
|
123 | 123 | |
|
124 | 124 | lock = wlock = tr = None |
@@ -230,7 +230,8 b' test same-parent transplant with --log' | |||
|
230 | 230 | (transplanted from e234d668f844e1b1a765f01db83a32c0c7bfa170) |
|
231 | 231 | 1 r2 |
|
232 | 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 | 236 | $ hg clone -r 1 ../t ../remote |
|
236 | 237 | adding changesets |
@@ -240,7 +241,7 b' remote transplant' | |||
|
240 | 241 | updating to branch default |
|
241 | 242 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
242 | 243 | $ cd ../remote |
|
243 | $ hg transplant --log -s ../t 2 4 | |
|
244 | $ hg --config diff.noprefix=True transplant --log -s ../t 2 4 | |
|
244 | 245 | searching for changes |
|
245 | 246 | applying 37a1297eb21b |
|
246 | 247 | 37a1297eb21b transplanted to c19cf0ccb069 |
General Comments 0
You need to be logged in to leave comments.
Login now