Results 1 to 4 of 4
  1. #1
    Join Date
    Feb 2010
    Posts
    5

    Default Mercurial + BC4: Marking conflict after a merge

    How to make BC4 mark all conflicts as resolved if a merge result is saved?

  2. #2
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    11,788

    Default

    Hello,

    Our save command does not clear the conflict flag. Once you perform your save, is there an issue cropping up that prevents the merge?

    Which version of Mercurial are you using and how was it configured?
    http://www.scootersoftware.com/suppo..._vcs#mercurial
    Aaron P Scooter Software

  3. #3
    Join Date
    Feb 2010
    Posts
    5

    Default

    I'm using TortoiseHg.

    Right now when there's a conflict, BC4 is called up to do a 3-way merge. Once all the conflicts are resolved, mercurial is not informed that they are resolved so I have to manually issue the hg resolve -m command.

    I'd like it to behave like kdiff3 that comes preinstalled with TortoiseHg. If all the conflicts in a file has been edited and saved it'll be mark resolved automatically.

    Maybe my issue is similar to this thread?

  4. #4
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    11,788

    Default

    Thanks for the clarification. BC4 does not currently support passing this information back, and does require the manual Resolve step after a merge. I'll add your example and suggestion to our wishlist. I do believe it is related to the previous thread, but that user never got back to us with more information unfortunately.
    Aaron P Scooter Software

Posting Permissions

  • You may not post new threads
  • You may not post replies
  • You may not post attachments
  • You may not edit your posts
  •