[Bitkeeper-users] (no subject)

[Rogers, Ross B]

Hi,

Wonder if someone has run into this before.
I'm doing a merge of two branches and having tons of renaming conflicts on deleted files from the two branches. Here is a sample of it:

The file has a name conflict of some type.
GCA:    design/lgddrbox/design/lgpbox/rtl/lgpcccwckedc.chf (greatest common ancestor)
Local:  BitKeeper/deleted/.del-lgpcccwckedc.chf pathname is available locally
Remote: BitKeeper/deleted/.del-lgpcccwckedc.chf~f341ad2a412dd498 pathname is available locally

The file is deleted from both branches but get put into the deleted dir with different name. And the resolve is prompting me the files one by one... here is the option I can do:

Commands are:

  ?    - print this help
  a    - abort the patch, DISCARDING all merges
  cl   - clear the screen
  d    - diff the local file against the remote file
  D    - run graphical difftool on local and remote
  hl   - revision history of the local file
  hr   - revision history of the remote file
  H    - run helptool
  l    - use the local file name
  m    - move the file to someplace else
  p    - graphical picture of the file history
  q    - immediately exit resolve
  r    - use the remote file name
  vl   - view the local file
  vr   - view the remote file
  x    - explain the choices

and I'm entering "l" to use the local file name for each prompt. But there are probably over 10,000 files got deleted, doing it manually is insane. Is there a program that can be written so that when one does a "bk pull" it will take care all the rename conflict if they are deleted files.


 - Ross
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.bitmover.com/pipermail/bitkeeper-users/attachments/20090721/369b1292/attachment.html