Mercurial > hg4j
diff src/org/tmatesoft/hg/internal/CommitFacility.java @ 619:868b2ffdcd5c
Close FIS, not FileChannel, to clear both references to FileDescriptor right away
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Fri, 17 May 2013 22:04:23 +0200 |
| parents | 7c0d2ce340b8 |
| children | 99ad1e3a4e4d |
line wrap: on
line diff
--- a/src/org/tmatesoft/hg/internal/CommitFacility.java Thu May 16 19:46:13 2013 +0200 +++ b/src/org/tmatesoft/hg/internal/CommitFacility.java Fri May 17 22:04:23 2013 +0200 @@ -196,8 +196,8 @@ } String oldBranchValue = DirstateReader.readBranch(repo); String newBranchValue = branch == null ? DEFAULT_BRANCH_NAME : branch; - // TODO undo.dirstate and undo.branch as described in http://mercurial.selenic.com/wiki/FileFormats#undo..2A if (!oldBranchValue.equals(newBranchValue)) { + // prepare undo.branch as described in http://mercurial.selenic.com/wiki/FileFormats#undo..2A File branchFile = transaction.prepare(repo.getRepositoryFile(Branch), repo.getRepositoryFile(UndoBranch)); FileOutputStream fos = null; try {