Mercurial > jhg

comparison cmdline/org/tmatesoft/hg/console/Merge.java @ 706:cd5c87d96315

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge: tests for mediator notifications
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Fri, 16 Aug 2013 14:54:09 +0200
parents b4242b7e7dfe
children
comparison
equal deleted inserted replaced
705:b4242b7e7dfe 706:cd5c87d96315
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 rev, Resolver resolver) throws HgCallbackTargetException { 59 public void same(HgFileRevision rev, Resolver resolver) throws HgCallbackTargetException {
60 System.out.printf("Unchanged %s:%s", rev.getPath(), rev.getRevision().shortNotation()); 60 System.out.printf("Unchanged %s:%s\n", 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\n", rev.getPath(), rev.getRevision().shortNotation());
65
66 } 65 }
67 66
68 public void onlyB(HgFileRevision base, HgFileRevision rev, Resolver resolver) throws HgCallbackTargetException { 67 public void onlyB(HgFileRevision base, HgFileRevision rev, Resolver resolver) throws HgCallbackTargetException {
69 System.out.printf("Left in second trunk only %s:%s\n", rev.getPath(), rev.getRevision().shortNotation()); 68 System.out.printf("Left in second trunk only %s:%s\n", rev.getPath(), rev.getRevision().shortNotation());
70 } 69 }