Re: [Bacula-devel] git question

2009-10-21 Thread Kern Sibbald
On Wednesday 21 October 2009 16:13:13 Yuri Timofeev wrote: > 2009/10/20 Eric Bollengier : > > On Tuesday 20 October 2009 11:02:49 James Harper wrote: > >> I have a checked out copy of bacula. I made some changes and sent the > >> resulting 'git diff' to kern, and it appears to have been committed.

Re: [Bacula-devel] git question

2009-10-21 Thread Yuri Timofeev
2009/10/20 Eric Bollengier : > On Tuesday 20 October 2009 11:02:49 James Harper wrote: >> I have a checked out copy of bacula. I made some changes and sent the >> resulting 'git diff' to kern, and it appears to have been committed. In >> between sending the 'git diff' and the subsequent 'git pull',

Re: [Bacula-devel] git question

2009-10-20 Thread Eric Bollengier
On Tuesday 20 October 2009 11:02:49 James Harper wrote: > I have a checked out copy of bacula. I made some changes and sent the > resulting 'git diff' to kern, and it appears to have been committed. In > between sending the 'git diff' and the subsequent 'git pull', I also > made some additional cha

[Bacula-devel] git question

2009-10-20 Thread James Harper
I have a checked out copy of bacula. I made some changes and sent the resulting 'git diff' to kern, and it appears to have been committed. In between sending the 'git diff' and the subsequent 'git pull', I also made some additional changes, and now git pull won't update my tree properly as the patc