Mercurial > hg4j
diff src/org/tmatesoft/hg/core/HgPullCommand.java @ 704:7743a9c10bfa
Merge command introduced
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Wed, 14 Aug 2013 20:07:26 +0200 |
| parents | d2552e6a5af6 |
| children | b4242b7e7dfe |
line wrap: on
line diff
--- a/src/org/tmatesoft/hg/core/HgPullCommand.java Wed Aug 14 14:51:51 2013 +0200 +++ b/src/org/tmatesoft/hg/core/HgPullCommand.java Wed Aug 14 20:07:26 2013 +0200 @@ -59,6 +59,7 @@ return this; } + // FIXME get repository lock public void execute() throws HgRemoteConnectionException, HgIOException, HgLibraryFailureException, CancelledException { final ProgressSupport progress = getProgressSupport(null); try {