Issue #2455 resolved

Null-merging a changeset with itself should not be allowed

Kris Van Hulle avatarKris Van Hulle created an issue

Scenario 1: -update to changeset X -right-click on changeset X, select 'Merge with local' -click 'Next' => error message with 'abort: merging with a working directory ancestor has no effect'

This is as it should be.

Scenario 2: -update to changeset X -right-click on changeset X, select 'Merge with local' -expand 'Options', check 'Discard all changes from merge target (other) revision' -click 'Next', then 'Discard', 'Next', 'Commit Now', and 'Finish'. => changeset X has been merged with itself.

This results in an changeset merged with itself, visualization that doesn't make sense, and distressed users. :-)

I'm not sure if this is a TortoiseHg bug, or a Hg bug. If it's Hg just close it and I'll re-submit it to the Hg bugtracker.

Comments (2)

  1. Steve Borho

    nifty.

    optimally the merge option would be disabled for the current working parent, but at the least we should check for this in the merge dialog when the null merge option is enabled.

  2. Log in to comment
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.