<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body>
<br>
<div class="moz-cite-prefix">On 10/1/20 12:34 AM, Carsten Leonhardt
wrote:<br>
</div>
<blockquote type="cite"
cite="mid:874kne99ml.fsf@arioch.leonhardt.eu">
<pre class="moz-quote-pre" wrap="">After having read a recent discussion on the debian-devel list, I'd
start with putting the clean upstream sources into branch
"upstream/latest", branch off "debian/latest" from there and add Debian
specifics there (i.e. the debian/ subdirectory).
Details are here, not yet updated after the recent discussion though:
<a class="moz-txt-link-freetext" href="https://dep-team.pages.debian.net/deps/dep14/">https://dep-team.pages.debian.net/deps/dep14/</a>
(Out of respect to people who feel that "master" is not a good word to
use, it will probably be replaced it with "latest" or "sid" in that draft)
This command might do all that work (I haven't used that yet for an initial import):
gbp import-orig --upstream-branch=upstream/latest --debian-branch=debian/latest --pristine-tar <tarball>
</pre>
</blockquote>
<p>Hi,<br>
<br>
I created two new branches (<b>upstream/latest</b> and <b>debian/latest</b>)
and are trying to run import-orig as described:<br>
<font face="monospace"><br>
mario@backup-dev:~/repos/bacula-libs3$ <b>gbp import-orig
--upstream-branch=upstream/latest
--debian-branch=debian/latest --pristine-tar
libs3-20200523.tar.gz </b><br>
What will be the source package name? [libs3] <br>
What is the upstream version? [20200523] <br>
gbp:info: Importing 'libs3-20200523.tar.gz' to branch
'upstream/latest'...<br>
gbp:info: Source package is libs3<br>
gbp:info: Upstream version is 20200523<br>
gbp:info: Merging to 'debian/latest'<br>
gbp:error: Automatic merge failed.<br>
gbp:error: Error detected, Will roll back changes.<br>
gbp:info: Rolling back branch upstream/latest by resetting it to
ff2ae198f54a2b9af16b893c700a2bda98caf315<br>
gbp:info: Rolling back branch 'pristine-tar' by deleting it<br>
gbp:info: Rolling back tag 'upstream/20200523' by deleting it<br>
gbp:info: Rolling back branch debian/latest by resetting it to
668b9a555153e531d4591079dddecac43a327150<br>
gbp:info: Rolling back failed merge of upstream/20200523<br>
gbp:error: Rolled back changes after import error.</font><br>
<br>
Getting error I have trouble understanding what is actually
failing. Could use some help here. :)<br>
<br>
Thanks in advance!<br>
<br>
Best regards,<br>
<br>
Mario.<br>
<br>
</p>
</body>
</html>