Package: git-buildpackage
Version: 0.2.27
Severity: normal

--- Please enter the report below this line. ---

Hello

I am using git-buildpackage to deal with the scigraphica package.

My problem is that during the import-orig of the new upstream version
(2.1.0)

The process stop du to a conflic between the 
git pull upstream .
I had to resolve the conflic before I can commit the merge.

but once the commit is done the debian directory is not up-to-date like
with uupdate.

Is their a way to deal with this problem.
A special option saying ok now I have merged master with upstream now
do the debian update process.

Have a nice day.



--- System information. ---
Architecture: i386
Kernel:       Linux 2.6.18-4-686

Debian Release: lenny/sid
  500 unstable        edevelop.org 
  500 testing         ftp.fr.debian.org 

--- Package information. ---
Depends                   (Version) | Installed
===================================-+-=================
python                     (>= 2.4) | 2.4.4-2
python-support             (>= 0.2) | 0.6.3
devscripts                          | 2.10.2
git-load-dirs            (>= 1.1.4) | 1.1.4
git-core           (>= 1:1.5.0.1-1) | 1:1.5.0.3-1




-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to