diff options
author | Guido Günther <agx@sigxcpu.org> | 2016-10-21 13:13:19 +0200 |
---|---|---|
committer | Guido Günther <agx@sigxcpu.org> | 2016-10-23 17:15:58 +0200 |
commit | 507ae509d37dddaf78af8e45b1af792bb8513825 (patch) | |
tree | ea57984acc936b0736ace1cb94c7c986aea1f0ba | |
parent | c092d7366feb6179d9a7e9516b38afddc28d57d7 (diff) |
import-orig: Document --rollback option
-rw-r--r-- | docs/chapters/import.sgml | 29 | ||||
-rw-r--r-- | docs/manpages/gbp-import-orig.sgml | 13 |
2 files changed, 42 insertions, 0 deletions
diff --git a/docs/chapters/import.sgml b/docs/chapters/import.sgml index ca2f927f..e58cca98 100644 --- a/docs/chapters/import.sgml +++ b/docs/chapters/import.sgml @@ -95,6 +95,35 @@ by version number. use <replaceable>%(version)s</replaceable> in your message to get the imported upstream version). </para> + + <sect2> + <title>Recovering from errors</title> + <para>In case of an error &gbp-import-orig; will by default + rollback (undo) all changes it has done to the repository so far: + </para> + <programlisting> + $ &gbp; import-orig --verbose --filter='CVS/*' --filter='.bzr/*' --filter='.hg/*' --filter='.svn/*' --upstream-version=1.9 ../gif2apng-1.9.tar.gz + gbp:info: Importing '../gif2apng-1.9.tar.gz' to branch 'upstream' (filtering out ["'CVS/*'", "'.bzr/*'", "'.hg/*'", "'.svn/*'"])... + gbp:info: Source package is gif2apng + gbp:info: Upstream version is 1.9 + gbp:info: Merging to 'master' + gbp:error: Automatic merge failed. + gbp:error: Error detected, Will roll back changes. + gbp:info: Rolling back branch upstream by resetting it to a6733c1f1e190ac0ed4774abc3466e9986a6df5e + gbp:info: Rolling back branch pristine-tar by resetting it to 0ee24ac614c920e30af82d602882c2ee841c88e5 + gbp:info: Rolling back tag upstream/1.9 by deleting it + gbp:info: Rolling back branch master by resetting it to ce99782336e83a56e8e579b3cdadf93b0c19e1a8 + gbp:info: Rolling back failed merge of upstream/1.9 + gbp:error: Rolled back changes after import error. + </programlisting> + <para> + In this case the import failed due to a merge conflict. Other + reasons are running out of disk space, problems when generating + the pristine-tar delta. If you don't want &gbp-import-orig; to + undo changes made to the repository use + the <option>--no-rollback</option>. + </para> + </sect2> </sect1> <sect1 id="gbp.import.convert"> diff --git a/docs/manpages/gbp-import-orig.sgml b/docs/manpages/gbp-import-orig.sgml index e1bcace4..2696f2b4 100644 --- a/docs/manpages/gbp-import-orig.sgml +++ b/docs/manpages/gbp-import-orig.sgml @@ -37,6 +37,7 @@ <arg><option>--[no-]symlink-orig</option></arg> <arg><option>--postimport=cmd</option></arg> <arg><option>--[no-]interactive</option></arg> + <arg><option>--[no-]rollback</option></arg> <arg><option>--download</option></arg> <group choice="plain"> <arg choice="plain"><replaceable>upstream-source</replaceable></arg> @@ -62,6 +63,10 @@ <replaceable>upstream</replaceable>), tagged and merged onto the debian branch (default: <replaceable>master</replaceable>). </para> + <para>In case of an error &gbp-import-orig; will rollback (undo) + all changes it has done to the repository (see + the <option>--rollback</option> option). + </para> </refsect1> <refsect1> <title>OPTIONS</title> @@ -309,6 +314,14 @@ </para> </listitem> </varlistentry> + <varlistentry> + <term><option>--[no-]rollback</option></term> + <listitem> + <para> + Rollback changes in case of an error. + </para> + </listitem> + </varlistentry> </variablelist> </refsect1> <refsect1> |