merge from branch resulted in access denied message error 5 lock held, can branches be nested? Parent is A, B is branch of A, and C is branch of B

Asked by lrosa on 2008-03-26

Aloha,

I've created a repository called dev. In dev I created a branch called drupalCORE. In drupalCORE I committed files. In dev I branched drupalCORE to drupalMODULES. In drupalMODULES I added files and committed. in dev I branched drupalMODULES to drupalPROD. In drupalPRODS I added files, and edited files, then commited.

Upgrade:
in drupalCORE copied new files resulting in some edited files --then commited. In drupalMODULES I try to merge and got error. Transcript is below

C:\src\dev\drupalCORE>bzr status
modified:
  CHANGELOG.txt
  INSTALL.txt
  includes/bootstrap.inc
  includes/common.inc
  includes/database.inc
  misc/textarea.js
  modules/block.module
  modules/comment.module
  modules/filter.module
  modules/poll.module
  modules/profile.module
  modules/system.module
  modules/upload.module
  modules/user.module
  sites/default/settings.php
  themes/chameleon/common.css

C:\src\dev\drupalCORE>

C:\src\dev\drupalCORE>bzr commit -m "Upgrade to Drupal-4.7.8"
Committing to: C:/src/dev/drupalCORE/
modified CHANGELOG.txt
modified INSTALL.txt
modified includes/bootstrap.inc
modified includes/common.inc
modified includes/database.inc
modified misc/textarea.js
modified modules/block.module
modified modules/comment.module
modified modules/filter.module
modified modules/poll.module
modified modules/profile.module
modified modules/system.module
modified modules/upload.module
modified modules/user.module
modified sites/default/settings.php
modified themes/chameleon/common.css
Committed revision 2.

C:\src\dev\drupalCORE>bzr tag drupal-4.7.8
Created tag drupal-4.7.8.

C:\src\dev\drupalCORE>

C:\src\dev\drupalCORE>cd ..

C:\src\dev>cd drupalMODULES

C:\src\dev\drupalMODULES>bzr merge
Merging from remembered location C:/src/dev/drupalCORE/
 M CHANGELOG.txt
 M INSTALL.txt
 M includes/bootstrap.inc
 M includes/common.inc
 M includes/database.inc
 M misc/textarea.js
 M modules/block.module
 M modules/comment.module
 M modules/filter.module
 M modules/poll.module
 M modules/profile.module
 M modules/system.module
 M modules/upload.module
 M modules/user.module
 M sites/default/settings.php
 M themes/chameleon/common.css
All changes applied successfully.
bzr: ERROR: Permission denied: "C:/src/dev/drupalMODULES/.bzr/branch/lock/held":
 [Error 5] Access is denied

C:\src\dev\drupalMODULES>bzr status
modified:
  CHANGELOG.txt
  INSTALL.txt
  includes/bootstrap.inc
  includes/common.inc
  includes/database.inc
  misc/textarea.js
  modules/block.module
  modules/comment.module
  modules/filter.module
  modules/poll.module
  modules/profile.module
  modules/system.module
  modules/upload.module
  modules/user.module
  sites/default/settings.php
  themes/chameleon/common.css
pending merges:
  Luis Rosa 2008-03-26 Upgrade to Drupal-4.7.8

C:\src\dev\drupalMODULES>

is nesting branches not permitted as I have done?

Subsequent merge request resulted in these error messages:

C:\src\dev\drupalMODULES>bzr merge
Unable to obtain lock file:///C:/src/dev/drupalMODULES/.bzr/branch/lock
held by <email address hidden> on host w2k3tst [process #2736]
locked 4 minutes, 17 seconds ago
Will continue to try until 09:56:14

C:\src\dev\drupalMODULES>bzr merge
Unable to obtain lock file:///C:/src/dev/drupalMODULES/.bzr/branch/lock
held by <email address hidden> on host w2k3tst [process #2736]
locked 4 minutes, 17 seconds ago
Will continue to try until 09:56:14

bzr: ERROR: Could not acquire lock "LockDir(file:///C:/src/dev/drupalMODULES/.bz
r/branch/lock)"

C:\src\dev\drupalMODULES>
C:\src\dev\drupalMODULES>

I tried logging out then back in -- got the same error message. Whats the best way to correct the problems that have developed?

Thanks

Luis

808-440-8841

Question information

Language:
English Edit question
Status:
Solved
For:
Bazaar Edit question
Assignee:
No assignee Edit question
Solved by:
lrosa
Solved:
2008-04-21
Last query:
2008-04-21
Last reply:
2008-04-21
lrosa (lrosa-hecouncil) said : #1

I've tried break-lock and it cleared the lock however, the merge operation failed (message below says it succeeded)

C:\src\dev\drupalMODULES>bzr merge
Unable to obtain lock file:///C:/src/dev/drupalMODULES/.bzr/branch/lock
held by <email address hidden> on host w2k3tst [process #2736]
locked 17 minutes, 54 seconds ago
Will continue to try until 10:09:51

bzr: ERROR: Could not acquire lock "LockDir(file:///C:/src/dev/drupalMODULES/.bz
r/branch/lock)"

C:\src\dev\drupalMODULES>bzr break-lock
Break lock file:///C:/src/dev/drupalMODULES/.bzr/branch/lock
held by <email address hidden> on host w2k3tst [process #2736]
locked 23 minutes, 14 seconds ago? [y/n]: y

C:\src\dev\drupalMODULES>bzr merge
Merging from remembered location C:/src/dev/drupalCORE/
bzr: ERROR: Working tree "C:/src/dev/drupalMODULES/" has uncommitted changes.

C:\src\dev\drupalMODULES>bzr status
modified:
  CHANGELOG.txt
  INSTALL.txt
  includes/bootstrap.inc
  includes/common.inc
  includes/database.inc
  misc/textarea.js
  modules/block.module
  modules/comment.module
  modules/filter.module
  modules/poll.module
  modules/profile.module
  modules/system.module
  modules/upload.module
  modules/user.module
  sites/default/settings.php
  themes/chameleon/common.css
pending merges:
  Luis Rosa 2008-03-26 Upgrade to Drupal-4.7.8

C:\src\dev\drupalMODULES>

C:\src\dev\drupalMODULES>bzr commit -m "Upgrade to drupal-4.7.8"
Committing to: C:/src/dev/drupalMODULES/
modified CHANGELOG.txt
modified INSTALL.txt
modified includes/bootstrap.inc
modified includes/common.inc
modified includes/database.inc
modified misc/textarea.js
modified modules/block.module
modified modules/comment.module
modified modules/filter.module
modified modules/poll.module
modified modules/profile.module
modified modules/system.module
modified modules/upload.module
modified modules/user.module
modified sites/default/settings.php
modified themes/chameleon/common.css
Committed revision 3.

C:\src\dev\drupalMODULES>bzr status

C:\src\dev\drupalMODULES>

C:\src\dev\drupalPROD>bzr status

C:\src\dev\drupalPROD>bzr info
Repository tree (format: pack-0.92)
Location:
  shared repository: C:/src/dev
  repository branch: .

Related branches:
  parent branch: C:/src/dev/drupalMODULES

C:\src\dev\drupalPROD>bzr merge
Merging from remembered location C:/src/dev/drupalMODULES/
 M modules/user.module
 M sites/default/settings.php
All changes applied successfully.

C:\src\dev\drupalPROD>

C:\src\dev\drupalPROD>bzr merge
Merging from remembered location C:/src/dev/drupalMODULES/
 M modules/user.module
 M sites/default/settings.php <---------------- NOTE from lrosa List of files is incorrect
All changes applied successfully.

C:\src\dev\drupalPROD>bzr diff modules/user.module <------- NOTE from lrosa No output was generated.

Any help is greatly appreciated.

Thanks

Luis

Martin Pool (mbp) said : #2

Hi,

So just to check: you did two consecutive merge operations in a row, with no other actions in between, and they both gave a summary of changes but did not change the files on disk?

Are all of the changes merged across correctly?

lrosa (lrosa-hecouncil) said : #3

Hi Martin,

Yes, and second question is no. The listings I provided above is the sequence I went through. I also tried a variation where I didnot use "init-repo" and just branched. Got the same results.

What about the workflow itself, is it reasonable?

Launchpad Janitor (janitor) said : #4

This question was expired because it remained in the 'Open' state without activity for the last 15 days.

Martin Pool (mbp) said : #5

Hi

The workflow sounds reasonable.

If you are experiencing a bug with either locking or merge, please file a bug on Bazaar. Sorry but I don't understand from the above just what the bug is.

lrosa (lrosa-hecouncil) said : #6

Hi Martin,

Thanks again.

Take care,

Luis