Hi Magnus,

this is what I meant by doing it manually:

status:0 [EMAIL PROTECTED] [1163] ~/test/data
% darcs query manifest
./data/conv.ml
./data/rand.ml
status:0 [EMAIL PROTECTED] [1164] ~/test/data
% darcs whatsnew -s
M ./data/conv.ml -8 +17
status:0 [EMAIL PROTECTED] [1165] ~/test/data
% rm rand.ml
status:0 [EMAIL PROTECTED] [1166] ~/test/data
% darcs whatsnew -s
M ./data/conv.ml -8 +17
R ./data/rand.ml
status:0 [EMAIL PROTECTED] [1167] ~/test/data
% darcs revert
hunk ./data/conv.ml 80
  ... hunk data cut off ...
Shall I revert this change? (1/?)  [ynWsfqadjkc], or ? for help: n
hunk ./data/conv.ml 83
  ... hunk data cut off ...
Shall I revert this change? (2/?)  [ynWsfqadjkc], or ? for help: n
hunk ./data/rand.ml 1
  ... hunk data cut off ...
Shall I revert this change? (3/?)  [ynWsfqadjkc], or ? for help: y
Do you really want to revert these changes? y
Finished reverting.
status:0 [EMAIL PROTECTED] [1168] ~/test/data
% darcs whatnew -s
M ./data/conv.ml -8 +17
status:0 [EMAIL PROTECTED] [1169] ~/test/data
%

Thanks for the tip. I can write some script which pulls data
 from whatsnew and puts deleted filenames on the command line
 of darcs revert. Not worth for the example above but I sometimes
 need to do it for tens of deleted files while preserving a lot
 of normal changes. Not as easy as 'svn up -r base' but good
 enough.


Peter.

Magnus Therning wrote:
On Tue, Jan 30, 2007 at 22:05:09 +0100, Peter Hercek wrote:
Hi all,

I would like to know how to safely get back deleted files in my working
copy (directory).

Here is the idea:
* I have modified files in my working copy which I want to keep as they
 are.
* I have some deleted files from working copy.
* I would like to get the modified files added to the working copy.

The missing files are in the (local) repository.
The (local) repository and the remote repository have the same patches.

... so I would need some kind of update, or reapplication of some of
the patches in the (local) repository.

Is the only option to revert only all the file deletions (by manually
selecting hungs to revert)?

Any better ideas?

What do you mean by "manually selecting things to revert"?  (I'm
assuming there's a spelling error in your email there ;-)

I would revert file deletions by reverting specific files:

 % darcs w -s
 R ./fileA
 M ./fileB +1
 % darcs revert -a fileA
 Reverting changes in "fileA"..

 Finished reverting.
 % darcs w -s
 M ./fileB +1

I don't think it can get less manual than that...

/M



------------------------------------------------------------------------

_______________________________________________
darcs-users mailing list
[email protected]
http://lists.osuosl.org/mailman/listinfo/darcs-users


_______________________________________________
darcs-users mailing list
[email protected]
http://www.abridgegame.org/mailman/listinfo/darcs-users

Reply via email to