Hi, the good news that hg (as well as the other DSCMs) is able to detect these cases and do the right thing. Things should improve here RSN.
Regards, Heiner Caolán McNamara wrote: > On Sat, 2009-10-03 at 09:31 +0900, Takashi Ono wrote: >> Hi all, >> >> I think if there exist recent changes in files being deleted in a >> integration of a cws, >> they should be automatically warned to RE. Is it considered in the standard >> of >> procedures? >> >> The background is i#105542. The file solenv/inc/wntgcci6.mk is deleted and >> added with a >> new name solenv/inc/wntgcci.mk. But because of the change of the name, >> recent update on >> the file got lost. > > Well, svn move, but that's what a move does unfortunately. Ideally a svn > move in a cws would propagate as that onwards in the merges, i.e. apply > all other pending changes to the file from other cwses, and then at the > end the move takes place on the merged file. Tricky I guess, unfortunate > when there a rename and content changes arrive together at integration > time. > > C. > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@tools.openoffice.org > For additional commands, e-mail: dev-h...@tools.openoffice.org > > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tools.openoffice.org For additional commands, e-mail: dev-h...@tools.openoffice.org
