search

IETF-OPSAWG-WG / draft-ietf-opsawg-pcap

PCAP next generation file format specification
Other
269 stars 62 forks source link

Remove old XML file #6

Closed hadrielk closed 9 years ago

hadrielk commented 9 years ago

Remove the old PCAP-DumpFileFormat.xml.

guyharris commented 9 years ago

Hmm.

Another possibility would be to take all of the commits of the new XML file, including the initial commit, turn them into commits to the old file (if that can be done in a way that not only preserves the committer, which Git supports, but also preserves the date and time of the commit), remove the old file, and then rename the old file to the new one, so that we can preserve the entire history.

Or, given that Git doesn't treat renames as VCS operations on the file being renamed, so you'd have to use --follow to get the full history following a rename, perhaps there's some other way to join the histories of the two files.

hadrielk commented 9 years ago

Maybe 'git merge-file' would do it... I'll try

hadrielk commented 9 years ago

Actually the draft-tuexen one already had the history of the PCAP-dump one. If you run "git log --follow -p -- draft-tuexen-opsawg-pcapng.xml" on the branch with the PCAP-dump file deleted, git will show the history all the way back to, and including, the PCAP-dump file's history.

guyharris commented 9 years ago

I think the trick there is --follow - that might make git log decide that the last version of PCAP-DumpFileFormat.xml and the first version of draft-tuexen-opsawg-pcapng.xml are the same file, as they're similar enough to each other.