Bug 5977: Uncommit & dirtiness

#8 Open
Repository
evolve
Branch
default
Repository
evolve-devel
Branch
default

Bitbucket cannot automatically merge this request.

The commits that make up this pull request have been removed.

Bitbucket cannot automatically merge this request due to conflicts.

Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:

hg update default
hg pull -r 91f4840eb786 https://bitbucket.org/danchr/evolve
hg merge 91f4840eb786
hg commit -m 'Merged in danchr/evolve (pull request #8)'
Author
  1. Dan Villiom Podlaski Christiansen
Reviewers
Description
  • uncommit: consolidate check for merges into precheck()
  • uncommit: require -f/--force when files have changes

    I used the bailifchanged() function, copied over from Mercurial and adjusted to take a matcher.

    While at it, I adjusted the merge error message to be consistent with the one used in Mercurial. The upside is that this should pick up translations, but the downside is that it uses the word 'uncommitted' to refer to outstanding changes.

Comments (1)