Show More
@@ -1134,7 +1134,6 b' class localrepository(object):' | |||||
1134 | raise error.ProgrammingError('transaction requires locking') |
|
1134 | raise error.ProgrammingError('transaction requires locking') | |
1135 | tr = self.currenttransaction() |
|
1135 | tr = self.currenttransaction() | |
1136 | if tr is not None: |
|
1136 | if tr is not None: | |
1137 | scmutil.registersummarycallback(self, tr, desc) |
|
|||
1138 | return tr.nest() |
|
1137 | return tr.nest() | |
1139 |
|
1138 | |||
1140 | # abort here if the journal already exists |
|
1139 | # abort here if the journal already exists |
@@ -354,7 +354,6 b' remote transplant with pull' | |||||
354 | added 1 changesets with 1 changes to 1 files |
|
354 | added 1 changesets with 1 changes to 1 files | |
355 | applying a53251cdf717 |
|
355 | applying a53251cdf717 | |
356 | a53251cdf717 transplanted to 8d9279348abb |
|
356 | a53251cdf717 transplanted to 8d9279348abb | |
357 | new changesets 37a1297eb21b:8d9279348abb |
|
|||
358 | $ hg log --template '{rev} {parents} {desc}\n' |
|
357 | $ hg log --template '{rev} {parents} {desc}\n' | |
359 | 2 b3 |
|
358 | 2 b3 | |
360 | 1 b1 |
|
359 | 1 b1 | |
@@ -560,7 +559,6 b' test "--merge" causing pull from source ' | |||||
560 | added 2 changesets with 2 changes to 2 files |
|
559 | added 2 changesets with 2 changes to 2 files | |
561 | applying a53251cdf717 |
|
560 | applying a53251cdf717 | |
562 | 4:a53251cdf717 merged at 4831f4dc831a |
|
561 | 4:a53251cdf717 merged at 4831f4dc831a | |
563 | new changesets 722f4667af76:4831f4dc831a |
|
|||
564 |
|
562 | |||
565 | test interactive transplant |
|
563 | test interactive transplant | |
566 |
|
564 |
General Comments 0
You need to be logged in to leave comments.
Login now