equal
deleted
inserted
replaced
1068 raise util.Abort(msg, hint=hint) |
1068 raise util.Abort(msg, hint=hint) |
1069 else: |
1069 else: |
1070 # Allow jumping branches if clean and specific rev given |
1070 # Allow jumping branches if clean and specific rev given |
1071 pas = [p1] |
1071 pas = [p1] |
1072 |
1072 |
|
1073 # deprecated config: merge.followcopies |
1073 followcopies = False |
1074 followcopies = False |
1074 if overwrite: |
1075 if overwrite: |
1075 pas = [wc] |
1076 pas = [wc] |
1076 elif pas == [p2]: # backwards |
1077 elif pas == [p2]: # backwards |
1077 pas = [wc.p1()] |
1078 pas = [wc.p1()] |