diff options
| author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2011-10-01 20:49:36 +0000 |
|---|---|---|
| committer | Lorry <lorry@roadtrain.codethink.co.uk> | 2012-09-27 13:27:51 +0000 |
| commit | 921ced43c48c1d170452a7b251b94cc96ec8dd44 (patch) | |
| tree | 3c4a89176ea67fe4c7bf7b375488361a823c95fa /mercurial/simplemerge.py | |
| parent | 9039c805b0a7e36220101323f82735f08a104b37 (diff) | |
| download | mercurial-tarball-master.tar.gz | |
Imported from /srv/lorry/lorry-area/mercurial-tarball/mercurial-1.9.3.tar.gz.HEADmercurial-1.9.3master
Diffstat (limited to 'mercurial/simplemerge.py')
| -rw-r--r-- | mercurial/simplemerge.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mercurial/simplemerge.py b/mercurial/simplemerge.py index 10d7f54..7283751 100644 --- a/mercurial/simplemerge.py +++ b/mercurial/simplemerge.py @@ -11,7 +11,8 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see <http://www.gnu.org/licenses/>. +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # mbp: "you know that thing where cvs gives you conflict markers?" # s: "i hate that." @@ -94,7 +95,7 @@ class Merge3Text(object): elif self.a[0].endswith('\r'): newline = '\r' if base_marker and reprocess: - raise CantReprocessAndShowBase + raise CantReprocessAndShowBase() if name_a: start_marker = start_marker + ' ' + name_a if name_b: @@ -222,8 +223,7 @@ class Merge3Text(object): # section a[0:ia] has been disposed of, etc iz = ia = ib = 0 - for region in self.find_sync_regions(): - zmatch, zend, amatch, aend, bmatch, bend = region + for zmatch, zend, amatch, aend, bmatch, bend in self.find_sync_regions(): #print 'match base [%d:%d]' % (zmatch, zend) matchlen = zend - zmatch @@ -445,7 +445,7 @@ def simplemerge(ui, local, base, other, **opts): out.write(line) if not opts.get('print'): - out.close() + out.rename() if m3.conflicts: if not opts.get('quiet'): |