Mercurial Repositories > eric / changeset
changeset
Fixed an issue in the Mercurial command line server interface code of commit causing a commit of a merge to fail.
Sat, 22 Oct 2011 13:20:50 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 22 Oct 2011 13:20:50 +0200
- changeset 1378
- f18a99689f2a
- parent 1377
- 5cf154a25e84
- child 1380
- 27c9c4ae64fd
Fixed an issue in the Mercurial command line server interface code of commit causing a commit of a merge to fail.
| Plugins/VcsPlugins/vcsMercurial/hg.py | file | annotate | diff | comparison | revisions |
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Sat Oct 22 13:17:45 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Sat Oct 22 13:20:50 2011 +0200 @@ -454,7 +454,8 @@ if isinstance(name, list): self.addArguments(args, name) else: - args.append(name) + if dname != repodir or fname != ".": + args.append(name) else: if isinstance(name, list): self.addArguments(args, fnames)
