Mercurial > jhg

comparison src/org/tmatesoft/hg/core/HgMergeCommand.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 42b88709e41d
comparison
equal deleted inserted replaced
705:b4242b7e7dfe 706:cd5c87d96315
360 if (revA == null && revB != null) { 360 if (revA == null && revB != null) {
361 dirstateBuilder.recordMergedFromP2(file); 361 dirstateBuilder.recordMergedFromP2(file);
362 } else { 362 } else {
363 dirstateBuilder.recordMerged(file, fw.fmode(), fw.mtime(), fw.bytesWritten()); 363 dirstateBuilder.recordMerged(file, fw.fmode(), fw.mtime(), fw.bytesWritten());
364 } 364 }
365 } else { 365 } // else no resolution was chosen, fine with that
366 assert false;
367 }
368 } 366 }
369 367
370 public void use(HgFileRevision rev) { 368 public void use(HgFileRevision rev) {
371 if (rev == null) { 369 if (rev == null) {
372 throw new IllegalArgumentException(); 370 throw new IllegalArgumentException();