Hi,
In the context of Debian packaging, I have a tree with an "upstream"
branch, and 2 stgit stack, one for maintainance ("etch") and one for
the next Debian version ("lenny"). I maintain them as stgit stacks to
be able to easily port changes to new upstream releases, and tag
debian revisions on the stack heads - so the ancestry of a revision to
the previous can only be tracked through stgit patch logs.
The recent history of those stack is a bit tricky, and that may not
help here: there was originally a single "debian" stack, and I had
already done some unreleased work in existing patches, when the need
for a bugfix release appeared. So I cloned the "main" branch, and
reproduced the previous release by deleting the only patch that had
moved since the last release, and picking it from the relevant commit.
Then to make things more interresting I imported a new release on
"upstream", and rebased stack "lenny" onto this new release.
Then I wanted to integrate the bugfix from "etch" into "lenny". So I
just tried to use "stg sync" on this patch. It should be noted that
this particular patch is the one that adds the Debian packaging files
(as opposed to the other ones, which modify the upstream source
files).
Here is what I get. I suppose that could have been expected, but that
looks nevertheless annoying...
tau-git$ stg sync -b etch debian
Checking for changes in the working directory... done
Synchronising "debian"...Error: File "debian/tau.files" added in branches but different
Error: File "debian/tau-racy.files" added in branches but different
Error: File "debian/rules" added in branches but different
Error: File "debian/changelog" added in branches but different
stg sync: GIT index merging failed (possible conflicts)
Traceback (most recent call last):
File "/export/work/yann/git/stgit/stg", line 43, in ?
main()
File "/export/work/yann/git/stgit/stgit/main.py", line 268, in main
command.func(parser, options, args)
File "/export/work/yann/git/stgit/stgit/commands/sync.py", line 163, in func
merge_patch(patch, p)
File "/export/work/yann/git/stgit/stgit/commands/sync.py", line 96, in <lambda>
merge_patch = lambda patch, pname: \
File "/export/work/yann/git/stgit/stgit/commands/sync.py", line 58, in __branch_merge_patch
git.merge(patch.get_bottom(), git.get_head(), patch.get_top())
File "/export/work/yann/git/stgit/stgit/git.py", line 664, in merge
raise GitException, 'GIT index merging failed (possible conflicts)'
stgit.git.GitException: GIT index merging failed (possible conflicts)
best regards,
--
Yann.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html