fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Again!
[redakcja.git]
/
lib
/
wlrepo
/
mercurial_backend
/
document.py
diff --git
a/lib/wlrepo/mercurial_backend/document.py
b/lib/wlrepo/mercurial_backend/document.py
index
e714561
..
d1c3e53
100644
(file)
--- a/
lib/wlrepo/mercurial_backend/document.py
+++ b/
lib/wlrepo/mercurial_backend/document.py
@@
-115,7
+115,8
@@
class MercurialDocument(wlrepo.Document):
return (True, False)
return (True, False)
- return self._revision.merge_with(sv._revision, user=user)
+ return self._revision.merge_with(sv._revision, user=user,
+ message="$AUTO$ Personal branch update.")
finally:
lock.release()
finally:
lock.release()