Re: RFS: testng/6.8.8-1
On Mon, Mar 17, 2014 at 10:29 AM, Emmanuel Bourg <ebourg@apache.org> wrote:
> 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
>
That's exactly the syntax I use. Beside debian/ directory conflict,
there were things like <version> in pom.xml which is natural to
change, but generates merge conflict since the same line is changed. I
found it much easier to just copy contents of tarball, rather than
fixing all the conflicts.
Reply to: