[ Thread Index |
Date Index
| More lists.liballeg.org/allegro-developers Archives
]
On Thursday 09 October 2008, Peter Wang wrote:
> On 2008-10-09, Thomas Fjellstrom <tfjellstrom@xxxxxxxxxx> wrote:
> > On Wednesday 08 October 2008, Peter Wang wrote:
> > > On 2008-10-08, Thomas Fjellstrom <tfjellstrom@xxxxxxxxxx> wrote:
> > > > On Monday 06 October 2008, Thomas Fjellstrom wrote:
> > > > > patch here: http://strangesoft.net/allegro-4.9-fshook.diff.gz
> > > >
> > > > new patch here: http://strangesoft.net/allegro-4.9-fshook2.diff.gz
> > >
> > > Go ahead and merge that.
> >
> > I hope you don't mind if I just apply it and commit. doing a proper "svn
> > merge" is going to be a royal pain, and may very well mess up 4.9's
> > history.
>
> I don't mind except that some of those file "moves" might be lost.
> Can you try to retain that?
Things like file moves and additions? I managed to make sure the commit worked
as well as the source I applied the patch to, so I think everything is ok. svn
status is really handy to notice files that have been added "?" or removed
"!".
Ah, but I think if what you're asking is right.. No I didn't retain them, the
patch removes any history of that when applied.
If you really want I can revert it and redo it to svn move some of the files I
moved...
> (although I use the repository from git now, so it doesn't affect me
> directly)
>
> Peter
>
>
> -------------------------------------------------------------------------
> This SF.Net email is sponsored by the Moblin Your Move Developer's
> challenge Build the coolest Linux based applications with Moblin SDK & win
> great prizes Grand prize is a trip for two to an Open Source event anywhere
> in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/
--
Thomas Fjellstrom
tfjellstrom@xxxxxxxxxx