CODEWITHSUNDEEP
mercurialmergerebase
jocull
jocull

Reputation: 21175

Mercurial hg merge default

I am running a rebase on a set of changes in Hg. Occasionally it comes up with a message that says something like local changed somefile.cs which remote deleted. use (c)hanged version or (d)elete?

I assume that when I am rebasing I want to follow what the remote is doing, so I have been deleting. If this is incorrect, someone stop me.

However, here is the big thing? I've noticed that if I just press Enter it seems to move on. However I have no idea what it is defaulting to. Does anyone know?

Upvotes: 9

Views: 2384

Answers (1)

Tim Henigan
Tim Henigan

Reputation: 62218

The default is to use the (c)hanged version. Rebase uses the merge logic for this operation.

There is no documentation of this default choice, but it is decided here: 

   216                 if repo.ui.promptchoice(
   217                     _(" local changed %s which remote deleted\n"
   218                       "use (c)hanged version or (d)elete?") % f,
   219                     (_("&Changed"), _("&Delete")), 0):
   220                     act("prompt delete", "r", f)
   221                 else:
   222                     act("prompt keep", "a", f)

There does not appear to be a way to automatically decide which option is selected.

Upvotes: 9

Related Questions