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
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\
modified:
CHANGELOG.txt
INSTALL.txt
includes/
includes/
includes/
misc/textarea.js
modules/
modules/
modules/
modules/
modules/
modules/
modules/
modules/
sites/
themes/
C:\src\
C:\src\
Committing to: C:/src/
modified CHANGELOG.txt
modified INSTALL.txt
modified includes/
modified includes/common.inc
modified includes/
modified misc/textarea.js
modified modules/
modified modules/
modified modules/
modified modules/poll.module
modified modules/
modified modules/
modified modules/
modified modules/user.module
modified sites/default/
modified themes/
Committed revision 2.
C:\src\
Created tag drupal-4.7.8.
C:\src\
C:\src\
C:\src\dev>cd drupalMODULES
C:\src\
Merging from remembered location C:/src/
M CHANGELOG.txt
M INSTALL.txt
M includes/
M includes/common.inc
M includes/
M misc/textarea.js
M modules/
M modules/
M modules/
M modules/poll.module
M modules/
M modules/
M modules/
M modules/user.module
M sites/default/
M themes/
All changes applied successfully.
bzr: ERROR: Permission denied: "C:/src/
[Error 5] Access is denied
C:\src\
modified:
CHANGELOG.txt
INSTALL.txt
includes/
includes/
includes/
misc/textarea.js
modules/
modules/
modules/
modules/
modules/
modules/
modules/
modules/
sites/
themes/
pending merges:
Luis Rosa 2008-03-26 Upgrade to Drupal-4.7.8
C:\src\
is nesting branches not permitted as I have done?
Subsequent merge request resulted in these error messages:
C:\src\
Unable to obtain lock file://
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\
Unable to obtain lock file://
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(
r/branch/lock)"
C:\src\
C:\src\
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:
- Last query:
- Last reply: