Mercurial > jhg

comparison cmdline/org/tmatesoft/hg/console/Merge.java @ 705:b4242b7e7dfe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge command: implement conflict resolution alternatives
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Thu, 15 Aug 2013 18:43:50 +0200
parents 7743a9c10bfa
children cd5c87d96315
comparison
equal deleted inserted replaced
704:7743a9c10bfa 705:b4242b7e7dfe
54 cmd.execute(m); 54 cmd.execute(m);
55 } 55 }
56 56
57 static class Dump implements HgMergeCommand.Mediator { 57 static class Dump implements HgMergeCommand.Mediator {
58 58
59 public void same(HgFileRevision first, HgFileRevision second, Resolver resolver) throws HgCallbackTargetException { 59 public void same(HgFileRevision rev, Resolver resolver) throws HgCallbackTargetException {
60 System.out.printf("Unchanged %s:%s", first.getPath(), first.getRevision().shortNotation()); 60 System.out.printf("Unchanged %s:%s", rev.getPath(), rev.getRevision().shortNotation());
61 } 61 }
62 62
63 public void onlyA(HgFileRevision base, HgFileRevision rev, Resolver resolver) throws HgCallbackTargetException { 63 public void onlyA(HgFileRevision base, HgFileRevision rev, Resolver resolver) throws HgCallbackTargetException {
64 System.out.printf("Left in first trunk only %s:%s", rev.getPath(), rev.getRevision().shortNotation()); 64 System.out.printf("Left in first trunk only %s:%s", rev.getPath(), rev.getRevision().shortNotation());
65 65