2 new changesets in crew: http://www.bitbucket.org/tortoisehg/crew/changeset/672e90b71f9e/ changeset: r2699:672e90b71f9e user: sborho date: 2009-06-05 06:02:51 summary: merge: more robust merge status detection
Allocate a new repo object after attempting a merge. This will give an accurate answer about the merge's success. affected #: 1 file (1 byte) http://www.bitbucket.org/tortoisehg/crew/changeset/c21176c29016/ changeset: r2700:c21176c29016 user: sborho date: 2009-06-05 06:27:46 summary: history: merge refresh fixes Needed to invalidate the repo dirstate in order to discover new parents. Needed to keep track of changelog size in order to discover merge commit. After the merge commit, we need to reload the log, not just refresh the model. affected #: 1 file (257 bytes) Repository URL: http://bitbucket.org/tortoisehg/crew/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. ------------------------------------------------------------------------------ OpenSolaris 2009.06 is a cutting edge operating system for enterprises looking to deploy the next generation of Solaris that includes the latest innovations from Sun and the OpenSource community. Download a copy and enjoy capabilities such as Networking, Storage and Virtualization. Go to: http://p.sf.net/sfu/opensolaris-get _______________________________________________ Tortoisehg-develop mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
