Skip to content

Commit 267bd21

Browse files
committed
git subrepo pull (merge) uno
subrepo: subdir: "uno" merged: "d84ba8b" upstream: origin: "https://github.com/prrvchr/uno.git" branch: "main" commit: "a2fa9f5" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596"
1 parent f21654b commit 267bd21

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

uno/.gitrepo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[subrepo]
77
remote = https://github.com/prrvchr/uno.git
88
branch = main
9-
commit = a2f0858e3a2da92686fb2e3dbd6ced674c3121f3
9+
commit = a2fa9f5975a35e8447907e51b0f78ac1b1b76e17
1010
parent = f954323c2464513bbce1f2f9fb8f700e2ea0da87
1111
method = merge
1212
cmdver = 0.4.3

uno/lib/uno/embedded/documenthandler.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ def _closeDataBase(self, document):
204204
if target.hasByName(name):
205205
target.removeElement(name)
206206
self._logger.logprb(INFO, 'DocumentHandler', '_closeDataBase()', 231, name)
207-
source.moveElementTo(name, target, name)
207+
source.copyElementTo(name, target, name)
208208
self._logger.logprb(INFO, 'DocumentHandler', '_closeDataBase()', 232, name)
209209
# FIXME: We need to clean the odb file if Save As as been used with a closed connection
210210
if target.hasElements():
@@ -260,4 +260,4 @@ def _moveStorage(self, source, target, oldname, newname):
260260
name = self._getStorageName(oldname, self._name, newname)
261261
if target.hasByName(name):
262262
target.removeElement(name)
263-
source.moveElementTo(oldname, target, name)
263+
source.copyElementTo(oldname, target, name)

0 commit comments

Comments
 (0)