Vladimir Kotal <Vladimir.Kotal at Sun.COM> writes: > Richard Lowe wrote: > > <snip> > >> It's probably preserving the rename (which is what 'workspace filerm' >> and 'wx rm' effectively do), rather than special casing deleted_files >> into an 'hg rm'. >> >> You should not re-create deleted_files in a mercurial gate. > > so the 'deleted_files' directory in the gate is merely an artifact > from Teamware epoch, right ?
The deleted_files/ directory in the mercurial gate is just about to be removed. Its existence up until now was an artifact of TeamWare, yes. >> As a workaround, you could 'hg rm' deleted_files in $CODEMGR_WS and >> usr/closed (as appropriate), after you have converted your workspace, >> a recommit following that should do the right thing. > > 1. hg rm // went ok > 2. hg recommit // complained about uncommited changes > 3. hg commit // for the deleted_files, added bogus message > 4. hg recommit // removed the bogus messaged added in previous step > from the comments > > Everything seems to be okay for the deleted files now (according to > hg outgoing'). Thanks for the tip. > > What still puzzles me a bit is how renamed files show up in 'hg > outgoing'. While 'hg list' says "foo.c (renamed from bar.c)", 'hg > outgoing' shows bar.c in 'deleted' and foo.c in 'added' section (so > it's not immediately obvious that something got renamed as was the > case with 'wx putback -n'). Right, list' is a cdm command, it's printing out what cdm knows. 'outgoing' is from Hg, and doesn't need to go as far as cdm does. (though I thought it printed copies, just not quite like that.) > Also, 'hg outgoing' could do with some line wrapping (one file per > line ?) for better readability. Maybe that's doable with the > --template/--style' options somehow ? It is, jmcp asked me about this last night too. You can adjust the style to insert \n's after each file. -- Rich
