Search Results

Search found 2823 results on 113 pages for 'perforce branch spec'.

Page 3/113 | < Previous Page | 1 2 3 4 5 6 7 8 9 10 11 12  | Next Page >

  • Where am I? * (no branch)

    - by Neofizz
    I've been getting familiar with creating, merging and deleting branches. I like to know where I am so I don't commit work into the wrong branch. I use git branch -a to see which branches I have. I think the asterix * shows which branch I'm currently on. What does it mean when I get: * (no branch) master origin/HEAD Because when I $git checkout mybranch I expect to see * mybranch master origin/HEAD

    Read the article

  • TeamCity Perforce checkout is ridiculously slow

    - by Ed Woodcock
    Hi folks: Using TeamCity with Perforce on the build server I'm setting up at work: It takes about 2 hours to check out the workspace each time I try to build. Does anyone have any idea WHY this would be the case, when it takes about two minutes to check out the full workspace from within P4V? Cheers, Ed

    Read the article

  • How to speedup perforce auto resolve?

    - by Sorin Sbarnea
    I would like to know how to speedup the perforce auto resolve when doing integration (merge yours and theirs if no conflicts exists). Currently is taking hours for ~5000 files when running it using a proxy server even if the proxy server has the files pre-cached. Also p4v interface doesn't give you any hint regarding the progress of the task, you do not know if it will finish in a second or next year.

    Read the article

  • assign a shelved changlist in perforce?

    - by Denise
    I'm really excited about Perforce's new shelve command. They say that you should be able to "reassign" the changelist to someone else, who can then unshelve it. How do I reassign a shelved changelist? Is there a way to do it in p4v, or only at the commandline?

    Read the article

  • using perforce with team foundation server

    - by rgupta4
    Does Team Foundation Server 2008 or upcoming 2010 work with perforce as the SCM tool? I haven't been able to find any documentation on the web indicating whether or not this configuration is supported? I apologize if this question has been answered elsewhere.

    Read the article

  • Perforce: rename a depot

    - by rifferte
    In Perforce, is it possible to rename a depot? I would imagine that you could integrate across different named depots, but I do not think that would carry over the full depot's history. I have seen this Renaming Depot Directories article, but this applies only to directories under a depot (and not the depot itself).

    Read the article

  • Is Perforce's C++ P4API thread-safe?

    - by Scott Bilas
    Simple question - is the C++ API provided by Perforce thread-safe? There is no mention of it in the documentation. By "thread-safe" I mean for server requests from the client. Obviously there will be issues if I have multiple threads trying to set client names and such on the same connection. But given a single connection object, can I have multiple threads fetching changelists, getting status, translating files through a p4 map, etc.?

    Read the article

  • perforce connect history of two different files

    - by dacwe
    Hi everyone! I have a problem, in a refactoring attempt I have copied files from one place to another and added them in my scm (perforce). When I was done and everything was working I deleted the old (moved) files. Can I connect the file histories with each other? The best would be to se the "move" like it should have been done.. Thankful for any help!

    Read the article

  • Meet the Spec Leads & Active JSRs

    - by heathervc
    For your Monday reading pleasure, the JCP has published Spec Lead Profiles of In Progress/Active JSRs--there are 35 of these Spec Leads!  Find out more about these dedicated community leaders.  In preparing these profiles, the PMO also asked Specification Leads to tell about their experiences  as Spec Leads.  There were many themes that emerged around transparency, openness, agility and participation.  This led to a related article for those interested in learning about the experience of participating in the development of a Java Specification through the JCP program, see: "Active Specification Leads Offer Best Practices and Tips for Success". In Progress/Active JSRs were also reported on in the PMO Presentation during the last JCP EC Face-to-Face meeting in September 2012.   Now is a good time to start thinking about nominations for Star Spec Leads.  Nominations for 2012 are now open.  Anyone can submit a nomination for Star Spec Lead; however, we ask that you nominate an active JSR Spec Lead, operating a JSR under JCP program version 2.8 (introduced October 2011) or above.  Nominations close 31 December 2012.

    Read the article

  • git branch naming best practices

    - by skiphoppy
    I've been using a local git repository interacting with my group's CVS repository for several months, now. I've made an almost neurotic number of branches, most of which have thankfully merged back into my trunk. But naming is starting to become an issue. If I have a task easily named with a simple label, but I accomplish it in three stages which each include their own branch and merge situation, then I can repeat the branch name each time, but that makes the history a little confusing. If I get more specific in the names, with a separate description for each stage, then the branch names start to get long and unwieldy. I did learn looking through old threads here that I could start naming branches with a / in the name, i.e., topic/task, or something like that. I may start doing that and seeing if it helps keep things better organized. What are some best practices for naming git branches? Edit: Nobody has actually suggested any naming conventions. I do delete branches when I'm done with them. I just happen to have several around due to management constantly adjusting my priorities. :) As an example of why I might need more than one branch on a task, suppose I need to commit the first discrete milestone in the task to the group's CVS repository. At that point, due to my imperfect interaction with CVS, I would perform that commit and then kill that branch. (I've seen too much weirdness interacting with CVS if I try to continue to use the same branch at that point.)

    Read the article

  • git filter-branch chmod

    - by Evan Purkhiser
    I accidental had my umask set incorrectly for the past few months and somehow didn't notice. One of my git repositories has many files marked as executable that should be just 644. This repo has one main master branch, and about 4 private feature branches (that I keep rebased on top of the master). I've corrected the files in my master branch by running find -type f -exec chmod 644 {} \; and committing the changes. I then rebased my feature branches onto master. The problem is there are newly created files in the feature branches that are only in that branch, so they weren't corrected by my massive chmod commit. I didn't want to create a new commit for each feature branch that does the same thing as the commit I made on master. So I decided it would be best to go back through to each commit where a file was made and set the permissions. This is what I tried: git filter-branch -f --tree-filter 'chmod 644 `git show --diff-filter=ACR --pretty="format:" --name-only $GIT_COMMIT`; git add .' master.. It looked like this worked, but upon further inspection I noticed that the every commit after a commit containing a new file with the proper permissions of 644 would actually revert the change with something like: diff --git a b old mode 100644 new mode 100755 I can't for the life of me figure out why this is happening. I think I must be mis-understanding how git filter-branch works. My Solution I've managed to fix my problem using this command: git filter-branch -f --tree-filter 'FILES="$FILES "`git show --diff-filter=ACMR --pretty="format:" --name-only $GIT_COMMIT`; chmod 644 $FILES; true' development.. I keep adding onto the FILES variable to ensure that in each commit any file created at some point has the proper mode. However, I'm still not sure I really understand why git tracks the file mode for each commit. I had though that since I had fixed the mode of the file when it was first created that it would stay that mode unless one of my other commits explicit changed it to something else. That did not appear to the be the case. The reason I thought that this would work is from my understanding of rebase. If I go back to HEAD~5 and change a line of code, that change is propagated through, it doesn't just get changed back in HEAD~4.

    Read the article

  • Extending Perforce to use a custom content diff tool for certain file extensions

    - by Fraser Graham
    I have various custom binary files stored in perforce and for many of the file types I have built a custom diff tool to show the content creators a diff of the actual changes to the file. E.g. If the file holds simple key value pairs as a compressed binary blob the diff tool would load each version into an in memory format and generate a list of additions, deletions and edits to the file presented in a nice clean report view. Much like the built in image diff tool in P4V i'd like to be able to use my own diff tool for certain file extensions within my depot and allow the users to use the existing P4V interface to pick revisions to diff between and examine history. So, I am aware you can write add-ins to P4V but I can't find any documentation on it and I'd like to know if this kind of extension functionality is available in P4V and how to use it?

    Read the article

  • How to setup Xcode 3.1.4 with Perforce ?

    - by Azeworai
    Hi everyone, I've been trying to setup Xcode with Perforce for about 7 hours now and managed to get the Perforce Repository Authenticated within Xcode. The problem I have is, within the repositories window, I don't see any directories for me to check out. I can see the p4root login and client are ok with the tick on the repository log. When I try to Import an xcode project directory within the Perforce root directory- the import fails with '/Users/jackson/p4root/alpha/MessageTapper' is not under the Perforce root. I have p4d running on the local machine, and have created a user and workspace. The workspace has the directories in view. I'm hoping for someone to give me some direction or maybe point me to a good reference to how to set perforce up with xcode. Thanks!

    Read the article

  • Project organization in perforce

    - by Chupa
    Hello. I created several web applications that use the same static files (css, js, images). When I use svn for version control, I use an external repository (svn: externals) to add files to the current project. For example: - Project_1 ---- Webapp -------- Static (external to static's repo) - Project_2 ---- Webapp -------- Static (external to static's repo) I could easily use it in their web pages by adding a link like /static/ ... But now our company has moved to perforce. How can I support the current structure? We also use maven, I think to pack these files as a jar and use as a dependency, but then my editor (idea) does not see that this dependence are js-scripts and styles. And i need to repackage and deploy jar file when create minor changes. How to use maven correctly?

    Read the article

  • perforce implementation of clearcase like "views"

    - by Pradyot
    I have read through the documentation on perforce and the "branching strategy" advice as well. One thing thats left me baffled, is how a simple concern is does not seem to adequtely adressed. When I am working on a project that touches many parts of our code base , I cannot checkin my code at the end of the day without checking into the trunk. So do I need to branch in this situation? I want to be able to have the ability to have a history of my changes in a long and hard project, so I can go back when I I make a wrong turn.. The problem with branching I see is that I will be creating copies of almost the entire codebase .. Am I missing an obvious solution here? thanks

    Read the article

  • Problem reintegrating a branch into the trunk in Subversion 1.5

    - by pako
    I'm trying to reintegrate a development branch into the trunk in my Subversion 1.5 repository. I merged all the changes from the trunk to the development branch prior to this operation. Now when I try to reintegrate the changes from the branch I get the following error message: Command: Reintegrate merge https://dev/svn/branches/devel into C:\trunk Error: Reintegrate can only be used if revisions 280 through 325 were previously Error: merged from https://dev/svn/trunk to the reintegrate Error: source, but this is not the case: Error: branches/devel/images/test Error: Missing ranges: /trunk/images/test:280-324 ... The message then goes on complaining about some folders in my project. But when I try to merge the changes from the trunk to the development branch again, TortoiseSVN tells me that there's nothing to merge (as I already merged all the changes before): Command: Merging revisions 1-HEAD of https://dev/svn/trunk into C:\devel, respecting ancestry Completed: C:\devel I'm trying to follow the instructions from here: http://svnbook.red-bean.com/en/1.5/svn.branchmerge.basicmerging.html, but there's nothing about solving such a problem. Any ideas? Perhaps I should just delete the trunk and then make a copy of my branch? But I'm not really sure if it's safe.

    Read the article

  • git create branch with untracked files

    - by Surya
    I've a master branch with a .gitignore file with directory X listed in it. (X is not being tracked). When I try to add a branch tracking a remote using the command git checkout -b mybranch origin/mybranch The remote branch is tracking X directory, and hence this checkout fails with the error Untracked working tree file 'X' would be overwritten by merge. what is the way out ? Surya

    Read the article

  • Using the slash character in Git branch name

    - by faB
    I'm pretty sure I saw somewhere in a popular Git project the branches had a pattern like "feature/xyz". However when I try to create a branch with the slash character, I get an error: $ git branch foo/bar error: unable to resolve reference refs/heads/labs/feature: Not a directory fatal: Failed to lock ref for update: Not a directory Same problem for (my initial attempt): $ git checkout -b foo/bar How does one create a branch in Git with the slash character?

    Read the article

  • Undoing branch creation in Mercurial

    - by michaelmior
    How can I undo the creation of a branch in Mercurial? For example, if I issue the command hg branch newbranch How can I delete this branch if I decide I entered the wrong name? I'm guessing this must be pretty simple to do, but I have yet to figure it out. Thanks!

    Read the article

  • Problem doing SVN Vendor Branch - merge

    - by Gyan
    Hi, I am trying to use the svn vendor branch to upgrade the third party library. (We have modified the source code) I followed all the steps to create the vendor branch:: created the vendor branch for old version (3rd party library) created the vendor branch for latest version (3rd party library) copied the latest version to current folder using (usign svn_load_dirs.pl script) structure of vendor repository in svn URL/vendor/library/3.5.0 URL/vendor/library/3.7.0 URL/vendor/library/current I have the library-3.5.0 used/modified at URL/trunk/library/customized-library I have a problem when I try to merge the difference between URL/vendor/library/3.7.0 and URL/vendor/library/3.5.0 to URL/trunk/library/customized-library I am at the folder where URL/trunk/library/customized-library is checked out and I use following command to do the merge svn merge URL/vendor/library/3.5.0 URL/vendor/library/current . --accept PARAMETERS when I use theirs-conflict for accept parameter, It ignores all of my changes to the old version and copies files from 3.7.0 when I user mine-conflict, it ignores the files in 3.7.0 when I use postpone, it throws exception "tree conflict" Thanks Gyan

    Read the article

  • merging selected revisions from one branch on another in Mercurial

    - by Assaf Lavie
    Is it possible to merge a range of revisions from one branch to another in Mercurial? e.g. |r1 |r2 |r3 |\___ | | r5 | | r6 | | r7 | | ... | | r40 |r41 If I want to merge revisions 6 & 7, but not 5, into the main branch - is this possible? What about multiple selected revision ranges from branch A to branch B? e.g. merge 4-7, 20-25 and 30-34? (this isn't a real case, just an illustration. I'm trying to understand if hg has this revision-range merge feature that I know svn has)

    Read the article

< Previous Page | 1 2 3 4 5 6 7 8 9 10 11 12  | Next Page >