(readding google-code-hosting@groups) I've got no idea, sadly. This is svn-fu that I've blissfully forgotten since moving to Mercurial almost 4 years ago. You might find help from [email protected]?
On Fri, Aug 5, 2011 at 9:48 AM, robert schaefer <[email protected]> wrote: > Hi Augie, > New question. > I created a branch, called "branch" updated the branch with revised files > and new files, committed, > then deleted my working directory and re-checked the branch out to make > sure it got there and no problems. > I then tried to merge the branch with the trunk and the trunk did not > change. > I tried the command: > svn merge https://pystatecharts.googlecode.com/svn/branch/ > https://pystatecharts.googlecode.com/svn/trunk/ ./pystatecharts --username > [email protected] > Where ./pystatecharts was my local working directory. > The command was accepted but nothing changed when I checked out the "trunk" > I re-checked out the branch to make sure that I didn't undo (perhaps > accidentally revert the new branch back to the old trunk). But the branch is > still ok. > My question to you is, does the trunk have to be checked out before the > merge? > Or am I missing something else? > thanks, > bob s. > On Tue, Aug 2, 2011 at 9:29 AM, Augie Fackler <[email protected]> wrote: >> >> On Tue, Aug 2, 2011 at 7:02 AM, robert schaefer <[email protected]> >> wrote: >> > Hi, >> > I am having trouble with svn. >> > >> > I was added to the pystatecharts admin and this is my first time as >> > an admin. >> > >> > I was asked by my co-admin to make a branch of the code before I >> > start making changes. >> > >> > This was the command I used: >> > svn cp -m 'making test branch' >> > https://pystatecharts.googlecode.com/svn/trunk/ >> > https://pystatecharts.googlecode.com/svn/trunk_branch/ --username >> > [email protected] >> > >> > svn then asked for my username and password. >> > I tried both username schaeferzero and [email protected], and >> > my gmail password but did not get in either time, >> > instead I got this error: >> > >> > svn: MKACTIVITY of '/svn/!svn/act/04a7bb11-c9c3-4acc-9e7d- >> > edcc3e22ada7': authorization failed: Could not authenticate to server: >> > rejected Basic challenge (https://pystatecharts.googlecode.com) >> > >> > Is the problem in my name or password, or what? >> >> You need to use the randomly generated password shown at >> https://code.google.com/hosting/settings, not your normal GMail >> password. >> >> > >> > thanks, >> > bob s. >> > >> > -- >> > You received this message because you are subscribed to the Google >> > Groups "Project Hosting on Google Code" group. >> > To post to this group, send email to >> > [email protected]. >> > To unsubscribe from this group, send email to >> > [email protected]. >> > For more options, visit this group at >> > http://groups.google.com/group/google-code-hosting?hl=en. >> > >> > > > -- You received this message because you are subscribed to the Google Groups "Project Hosting on Google Code" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/google-code-hosting?hl=en.
