projects
/
dupemerge
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b2ef2da
)
Make sure we are using the right inode filename
author
Zygo Blaxell
<zblaxell@esightcorp.com>
Thu, 13 May 2010 20:53:53 +0000
(16:53 -0400)
committer
Zygo Blaxell
<zblaxell@esightcorp.com>
Thu, 13 May 2010 20:53:53 +0000
(16:53 -0400)
dm6
patch
|
blob
|
history
diff --git
a/dm6
b/dm6
index 8b45f507058e652a4093d6c51fe8fb7c57ae0091..26546983bccc5b0b1e1b3ae97e584df831163f85 100755
(executable)
--- a/
dm6
+++ b/
dm6
@@
-170,7
+170,7
@@
while (<STDIN>) {
print STDERR "\b";
# Which file are we keeping?
print STDERR "\b";
# Which file are we keeping?
- my $keep_
file
;
+ my $keep_
ino
;
# If digest link exists, link it to file
if ($digest_st) {
# If digest link exists, link it to file
if ($digest_st) {
@@
-180,17
+180,18
@@
while (<STDIN>) {
# Old, replace input with old file
print STDERR '-';
link_files($digest_link, $file);
# Old, replace input with old file
print STDERR '-';
link_files($digest_link, $file);
- $keep_
file = $digest_link
;
+ $keep_
ino = $digest_st->ino
;
} else {
# New, add input to digest
print STDERR '+';
link_files($file, $digest_link);
} else {
# New, add input to digest
print STDERR '+';
link_files($file, $digest_link);
- $keep_
file = $file
;
+ $keep_
ino = $st->ino
;
}
# A link to the inode indicates we are done, so do it last
}
# A link to the inode indicates we are done, so do it last
+ my $keep_link = prepare_parents("$link_dir/inode", $keep_ino);
print STDERR '_';
print STDERR '_';
- link_files($keep_
file
, $inode_link);
+ link_files($keep_
link
, $inode_link);
}
};
}
};