Re: RFS: testng/6.8.8-1
Le 17/03/2014 09:14, Eugene Zhukov a écrit :
> I fetched source with get-orig-source, then I run git-import-orig, but
> as it generated plenty of merge conflicts incl. deleting debian/
> folder, I discarded those. Then I just copied contents of orig.tar.gz
> into main tree and was done with it.
That's odd, git-import-orig updates the 'upstream' branch and then
merges it with the 'master' branch. The debian/ directory shouldn't be
affected. Are you using this syntax for git-import-orig?
git-import-orig --merge --verbose --pristine-tar foo.tar.gz
The only conflict I have encountered with this workflow is with the
.gitignore file. I updated it to include the .pc directory but it
conflicted with changes made upstream. Now I leave it unchanged to avoid
any issue.
Emmanuel Bourg
Reply to: